Merge "Release Maven artifacts 2.2.1 of Policy Service" into dawn