Merge "Remove parent tag from parent pom.xml"