PIM-2071: Make resolve target entity useable with Category entity

Bug fix: [yes]
Feature addition: [yes]
Backwards compatibility break: [no]
Unit test passes: [yes]
Specs passes: [yes]
Behat scenario passes: [yes]
Checkstyle issues: [no]*
ChangeLog updated: [yes]
Fixes the following jira:
 - PIM-2071