Merge branch 'stable-3.4' * stable-3.4: Ensure states are updated for canceled replication tasks Change-Id: Ifc514a151819f5d809a1834d382857baf334a8a2