Fix product association import
Merge branch 'master' into PIM-1516