support promoted builds
Merge branch 'master' into master_ialbors

Conflicts:
	pom.xml