Pom cleanup.
Merge pull request #2755 from nawroth/pom-cleanup

Pom cleanup.