Merge branch '9898-container-lock-api'
authorTom Clegg <tom@curoverse.com>
Thu, 8 Sep 2016 23:19:42 +0000 (19:19 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 8 Sep 2016 23:19:42 +0000 (19:19 -0400)
closes #9898


Trivial merge