reincluded the latest pom.xml changes from the master branch.