Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Call retryDone() when giving up after lock failures
  Fix issue with task cleanup after retry

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