[backport-1.6]: MR "bootstrap: don't inherit the auto-cluster-machines-ready-dep from defaults" needs a 1.6.x backport

MR !7617 (merged) needs to be backported to 1.6.x