Product Picker fix for new product api
Merge pull request #875 from protherj/final-1.4.0-issues

Product Picker fix for new product api