Merge branch 'master' into stable #262

Job	Run time
build-and-push-base	6m 5s
build-and-push-pg	45s
build-and-push-base-no-s6	5m 57s
build-and-push-cron-task-no-s6	1m 43s
build-and-push-manager-no-s6	4m 38s
build-and-push-cron-no-s6	1m 44s
build-and-push-portal-hiperf-no-s6	4m 54s
build-and-push-portal-no-s6	4m 54s
build-and-push-ssoaas-fastcgi-server-no-s6	2m 26s
build-and-push-sessions-backup-no-s6	30s
build-and-push-manager	4m 24s
build-and-push-cron-task	1m 46s
build-and-push-cron	1m 45s
build-and-push-portal	5m 2s
build-and-push-portal-hiperf	4m 56s
build-and-push-sessions-backup	46s
build-and-push-ssoaas-fastcgi-server	2m 29s
build-and-push-full-no-s6	3m 6s
build-and-push-full	3m 4s
	1h 0m 54s

Provide feedback