[backport-1.7]: MR "Draft: workload-cluster: robustness improvement for dummy units" needs a 1.7.x backport

MR !8581 (merged) needs to be backported to 1.7.x