Merge branch 'stable-3.4' into 'stable-3.5' * stable-3.4: Do not retry replication when local repository not found Ensure states are updated for canceled replication tasks Change-Id: Ic0e523c7c92222b49916aed7067836d4e6d2f6e7