Merge branch '8470-resolve-container-req'
authorTom Clegg <tom@curoverse.com>
Mon, 27 Jun 2016 19:10:31 +0000 (15:10 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 27 Jun 2016 19:10:31 +0000 (15:10 -0400)
closes #8470


Trivial merge