Merge branch 'stable-3.3'

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

Change-Id: Ib2216e3b06ea62cb06c22ad955a8c252f3bacccc
tree: 10f222f20e290e3a68dc73dd2a88ea481995127d
  1. .gitignore
  2. .mailmap
  3. .settings/
  4. BUILD
  5. LICENSE
  6. src/