Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  PushOne: Improve logging of lock failure

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