997634-migrate-roles - set 'type' value appropriately

997634-migrate-roles - removed trailing whitespace
Merge pull request #2782 from thomasmckay/997634-migrate-roles

997634-migrate-roles - set 'type' value appropriately
Content Views: Worked on filtering

Refactored package filter code and added support for puppet module filtering.
Merge pull request #2780 from daviddavis/puppet-filtering

Puppet filtering