Merge "Breaking up 6360: common pom file"