Fix/pim 2015

Bug fix: [yes|no]
Feature addition: [yes|no]
Backwards compatibility break: [yes|no]
Unit test passes: [yes]
Specs passes: [no]
Replaced unit test classes removed: [N.A.]
Behat scenario passes: [yes ?]
Checkstyle issues: [no]
ChangeLog updated: [yes]
Documentation PR: [N.A.]
Fixes the following jira: PIM-2015