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