cleanup - make pom.xml files more consistent
Merge pull request #1504 from darxriggs/maven-pom-cleanup

cleanup - make pom.xml files more consistent