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