Merge branch '9709-restore-manifest-logging'
authorTom Clegg <tom@curoverse.com>
Thu, 25 Aug 2016 19:19:00 +0000 (15:19 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 25 Aug 2016 19:19:00 +0000 (15:19 -0400)
closes #9709


Trivial merge