Merge branch 'stable-3.4'

* stable-3.4:
  Ensure states are updated for canceled replication tasks

Change-Id: Ifc514a151819f5d809a1834d382857baf334a8a2
tree: 8b5d64e3b704eb435eb0ef115e054cd0fbbcbcf7
  1. .settings/
  2. src/
  3. .gitignore
  4. .mailmap
  5. BUILD
  6. LICENSE