Merge "Use correct parent pom"