Merge branch '9309-centos-7-packages-wip'
authorBrett Smith <brett@curoverse.com>
Wed, 1 Jun 2016 18:28:24 +0000 (14:28 -0400)
committerBrett Smith <brett@curoverse.com>
Wed, 1 Jun 2016 18:28:24 +0000 (14:28 -0400)
Refs #9309.  Closes #9313.


Trivial merge