More pom.xml polishing
Merge branch '4.x'