Initial 2.8 commit
Upgraded to next SNAPSHOT
Merge remote-tracking branch 'origin/2.9'

Conflicts:
	pom.xml
	storage-plugin/pom.xml
	storage-plugin/src/main/resources/archetype-resources/pom.xml