Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Do not synchronize replication config shutdown Change-Id: Ia8870aa9b4692825b3d878d7546e8c1d7cf45726