Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  LfsLocksAction: Use Logger's built-in string formatting

Change-Id: I58a89e20b49cc3fefeaf58b1d19c8ac16eee5835