Merge branch '7957-new-software-collections-install-wip'
authorBrett Smith <brett@curoverse.com>
Mon, 4 Jan 2016 20:07:39 +0000 (15:07 -0500)
committerBrett Smith <brett@curoverse.com>
Mon, 4 Jan 2016 20:07:39 +0000 (15:07 -0500)
Closes #7957, #8097.


Trivial merge