[backport-1.7]: have cluster-machines-ready wait for last node to be drained/deleted

A solution for issue #4269 (closed) needs to be backported to 1.7.x