Merge "Wait for server activations for the updated servers"