Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Id987043c8a26bd3f69fb4bd5b84591ae20cb83ba
tree: 26a5b337d78c8fb73d5a2f9b6090069ec4e75960
  1. .gitignore
  2. .mailmap
  3. .settings/
  4. BUILD
  5. LICENSE
  6. src/