Restore pom.xml changes from earlier dev branch