Merge tag 'stable-8922-1-ems.1' into openshift #158

Job	Run time
build-push-base / build-push	41s
build-push-base-java / build-push	44s
build-push-prosody / build-push	49s
build-push-web / build-push	42s
build-push-jicofo / build-push	39s
build-push-jibri / build-push	2m 25s
build-push-jvb / build-push	42s
build-push-jigasi / build-push	48s
	7m 30s

Provide feedback