Merge branch 'stable-3.0' into stable-3.1

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

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