Merge "Fix wfWaitForSlaves() so the $wiki parameter actually works correctly"