Merge branch 'releaseplugin' into emergent

* releaseplugin:
  Update pom for compatibility with the maven-release-plugin
Point to emergent