Merge "Rename policy-agent in pom file"