Merge branch 'stable-3.2'

* stable-3.2:
  Fix issue with URI lock release after replication task cancellation

Change-Id: If7b88e2a7b620ae158e3a14c213cfa8483c13642