Removed mid-transaction wfWaitForSlaves() calls

Change-Id: I7f0b857b2aa33bbc7340fc989a9ce01cadc4e35f
Merge "Removed mid-transaction wfWaitForSlaves() calls"