Merge branch '9309-centos7-uplaods-wip'
authorBrett Smith <brett@curoverse.com>
Wed, 1 Jun 2016 19:27:38 +0000 (15:27 -0400)
committerBrett Smith <brett@curoverse.com>
Wed, 1 Jun 2016 19:27:38 +0000 (15:27 -0400)
Refs #9309.


Trivial merge