Merge branch 'stable-3.1'

* stable-3.1:
  Do not remove replication tasks if they are retrying

Change-Id: I5cbdcd29541f6d88fe93364cc4769b93123138b5
tree: 534533d672fb662cddbb31b6d11c8d0e411a3a26
  1. .settings/
  2. src/
  3. .gitignore
  4. .mailmap
  5. BUILD
  6. LICENSE