Merge branch 'feature/containers' into cdh5-containers

Conflicts:
	pom.xml