Update with merge from main-3 #1585

Job	Run time
scan	1m 42s
build	25m 32s
Build and Publish Images / Build extra images	42s
Build and Publish Images / Prepare Job	10s
Build and Publish Images / Publish (spring-cloud-dataflow-single-step-batch-job, spring-cloud-dataflow-single-step-batch-job...	2m 21s
Build and Publish Images / Publish (spring-cloud-dataflow-server, spring-cloud-dataflow-server/target, springcloud/spring-cl...	1m 11s
Build and Publish Images / Publish (spring-cloud-dataflow-composed-task-runner, spring-cloud-dataflow-composed-task-runner/t...	1m 27s
Build and Publish Images / Publish (spring-cloud-dataflow-tasklauncher-sink-rabbit, spring-cloud-dataflow-tasklauncher/sprin...	1m 30s
Build and Publish Images / Publish (spring-cloud-dataflow-tasklauncher-sink-kafka, spring-cloud-dataflow-tasklauncher/spring...	1m 7s
Build and Publish Images / Publish (spring-cloud-skipper-server, spring-cloud-skipper/spring-cloud-skipper-server/target, sp...	1m 28s
done	1s
	37m 11s

Provide feedback