Merge "Remove WaitForSlave maintenance script"