Merge "Change the parent of pom to oparent"