Merge "Made wfWaitForSlaves() support waiting on all clusters as needed"