Merge branch '6691-trusty-packages-wip'
authorBrett Smith <brett@curoverse.com>
Mon, 27 Jul 2015 12:55:43 +0000 (08:55 -0400)
committerBrett Smith <brett@curoverse.com>
Mon, 27 Jul 2015 12:55:43 +0000 (08:55 -0400)
Refs #6691.  Closes #6742.


Trivial merge