Wait for slaves to catch up on correct cluster

Change-Id: I8c9597ffde511f54949fb931c2e2c31a492f794b
Merge "Wait for slaves to catch up on correct cluster"