Backport s390x and CI fixes - 2.36/4.7 #7779

Job	Run time
pre-build-updater	3m 53s
define-scanner-job-matrix	4s
unit-tests	5m 6s
style-check	5m 59s
db-integration-tests	2m 31s
pre-build-scanner (linux, ppc64le)	2m 56s
pre-build-scanner (linux, s390x)	3m 1s
pre-build-scanner (linux, arm64)	2m 56s
pre-build-scanner (linux, amd64)	2m 51s
generate-scanner-bundle (linux, s390x)	2m 26s
generate-scanner-bundle (linux, ppc64le)	3m 11s
generate-scanner-bundle (linux, amd64)	2m 32s
generate-scanner-bundle (linux, arm64)	2m 34s
generate-genesis-dump	0s
generate-scanner-db-bundle	1m 30s
diff-dumps	0s
generate-db-dump	0s
upload-db-dump	0s
upload-dumps-for-downstream	0s
build-and-push-vulnerabilities-image	0s
upload-dumps-for-embedding	0s
build-images (linux, s390x)	7m 19s
build-images (linux, arm64)	6m 11s
build-images (linux, amd64)	3m 40s
build-images (linux, ppc64le)	6m 56s
push-manifests	4m 26s
send-notification	-1s
	1h 10m 1s

Provide feedback