Parent POM cleanup and preparation for Sonatype publishing
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/pom.xml