Merge "fixes in pom.xml for the project to"