Cleaning up example code from archetype
Merge branch 'master' into feature/start-containers

Conflicts:
	src/it/simple-it/pom.xml