Merge "Tweaked some of the default LockManager ttls"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 27 Oct 2014 17:51:39 +0000 (17:51 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 27 Oct 2014 17:51:39 +0000 (17:51 +0000)

Trivial merge