15370: Merge branch 'main' into 15370-loopback-dispatchcloud

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --cc lib/boot/supervisor.go
Simple merge

diff --cc lib/config/config.default.yml
Simple merge

diff --cc lib/crunchrun/executor_test.go
Simple merge

diff --cc lib/crunchrun/integration_test.go
Simple merge