Merge tag 'v2.20.0-2' into stable #276

Job	Run time
build-and-push-pg	34s
build-and-push-base	5m 55s
build-and-push-base-no-s6	5m 58s
build-and-push-cron	2m 10s
build-and-push-manager	4m 48s
build-and-push-portal	4m 45s
build-and-push-cron-task	1m 47s
build-and-push-sessions-backup	47s
build-and-push-portal-hiperf	4m 40s
build-and-push-ssoaas-fastcgi-server	2m 21s
build-and-push-sessions-backup-no-s6	41s
build-and-push-cron-no-s6	1m 53s
build-and-push-cron-task-no-s6	1m 30s
build-and-push-manager-no-s6	4m 40s
build-and-push-portal-hiperf-no-s6	4m 41s
build-and-push-ssoaas-fastcgi-server-no-s6	2m 19s
build-and-push-portal-no-s6	4m 42s
build-and-push-full	2m 57s
build-and-push-full-no-s6	2m 56s
	1h 0m 4s

Provide feedback