Merge branch 'stable-3.12' into stable-3.13 * stable-3.12: Add --remote switch to replication start command Change-Id: Ifa94395155956f48dae777e0e41222a79554afbd