Let maintenance script wait for slaves on the correct cluster

Change-Id: I45872e0912ed5949586a15ae77123c8f1bb6151c
Merge "Let maintenance script wait for slaves on the correct cluster"