Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: Id73f36de2b7d3a86520b58c31725d36a22828d5f
tree: 99eb8bf90a0b1ec17b221d709dbe4e2a20538bb1
  1. .gitignore
  2. .mailmap
  3. .settings/
  4. BUILD
  5. LICENSE
  6. src/