Merge tag 'tags/stable-9646-ems.1' into openshift #203

Job	Run time
build-push-excalidraw / build-push	28s
build-push-base / build-push	35s
build-push-web / build-push	1m 11s
build-push-prosody / build-push	33s
build-push-base-java / build-push	51s
build-push-jigasi / build-push	39s
build-push-jicofo / build-push	37s
build-push-jvb / build-push	1m 10s
build-push-jibri / build-push	3m 53s
	9m 57s

Provide feedback