Merge branch 'stable-3.1'

* stable-3.1:
  Fix issue with task cleanup after retry

Change-Id: I49ff116e5eeef335c35479d1da6ab492e80d11cf
tree: f0f890ad10080805cb93d9fae23c187dd9823c90
  1. .settings/
  2. src/
  3. .gitignore
  4. .mailmap
  5. BUILD
  6. LICENSE