Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Make the shouldReplicateNewProject test more reliable Change-Id: I40ecf25a108f2dfd0926b3fb6ba166a77cf0f039