Fixing pom's on the 6.0.x branch