Merge branch '7829-package-licenses-wip'
authorBrett Smith <brett@curoverse.com>
Mon, 7 Dec 2015 15:01:26 +0000 (10:01 -0500)
committerBrett Smith <brett@curoverse.com>
Mon, 7 Dec 2015 15:01:26 +0000 (10:01 -0500)
Refs #7829.  Closes #7914.


Trivial merge