Merge pull request #931 from rustyswayne/1.5.0

Reviewing basket packaging strategy. Needs to be refactored to allow for products not defined in the catalog and to deal with multiple catalogs more effectively