Merge "Fixes to LocalFile::lock()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 5 Jul 2016 20:08:53 +0000 (20:08 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 5 Jul 2016 20:08:53 +0000 (20:08 +0000)

Trivial merge