Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  PushOne: Improve format of log of references to be pushed
  Don't lose state when there's a pending push to the same ref

Change-Id: I78a3f0ff2e596a88d162fbe84caa1282ca1589f6