Merge branch '9309-centos-7-rails-scripts-wip'
authorBrett Smith <brett@curoverse.com>
Wed, 15 Jun 2016 15:52:00 +0000 (11:52 -0400)
committerBrett Smith <brett@curoverse.com>
Wed, 15 Jun 2016 15:52:00 +0000 (11:52 -0400)
Refs #9309.  Closes #9351, #9345.


Trivial merge