Merge branch 'stable-3.11'

* stable-3.11:
  Do not throw an exception when refs/multi-site/version lock fails
  Reformat with GJF 1.24.0

Change-Id: I7220719b6bbebd93d3e57f7a10967f3d97ee6879