Fixed bug in pom-*.xml
Merge branch '3.1.x' into beta/4.0.0