PIM-1239

Bug fix: [yes]
Feature addition: [no]
Backwards compatibility break: [no]
Unit test passes: [yes]
Behat scenarios passes: [yes]
Checkstyle issues: [no]*
Fixes the following jira:
 - PIM-1239