Merge branch '6847-docker-dns-wip'
authorBrett Smith <brett@curoverse.com>
Mon, 3 Aug 2015 00:10:17 +0000 (20:10 -0400)
committerBrett Smith <brett@curoverse.com>
Mon, 3 Aug 2015 00:10:17 +0000 (20:10 -0400)
Closes #6847, #6853.


Trivial merge