Nick O: Cleaned up some final pom stuff ahead of migration to sonatype as the distro repo