Merge "update parent references in policy/parent pom"