PIM-1528 : Change metric data model

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