Did my best to rebase. Now includes the latest changes made to devel, along with my change of adding category option to module
Merge pull request #6746 from Jmainguy/svr4pkg

svr4pkg changes - Did my best to rebase. Now includes the latest changes made to devel, al...