Merge branch 'stable-3.1'

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

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