Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Cancel pending replications upon shutdown Remove replication event from pending when runway is allowed Change-Id: Icc8842c36e09e3de926ad585a104539a72980059