Merge stable-9111.ems-1 into openshift branch #172

Job	Run time
build-push-base / build-push	29s
build-push-prosody / build-push	29s
build-push-base-java / build-push	22s
build-push-web / build-push	26s
build-push-jvb / build-push	31s
build-push-jigasi / build-push	24s
build-push-jicofo / build-push	20s
build-push-jibri / build-push	1m 4s
	4m 5s

Provide feedback