Merge branch 'stable-9220-1-ems.1' into openshift #180

Job	Run time
build-push-base / build-push	33s
build-push-web / build-push	33s
build-push-prosody / build-push	34s
build-push-base-java / build-push	42s
build-push-jigasi / build-push	40s
build-push-jibri / build-push	2m 17s
build-push-jicofo / build-push	29s
build-push-jvb / build-push	41s
	6m 29s

Provide feedback