PIM-2210 Merge common ODM and ORM listeners

| Q                   | A
| ------------------- | ---
| Bug fix?            | no
| New feature?        | no 
| BC breaks?          | no
| Tests pass?         | yes
| Scenarios pass?     | 743
| Checkstyle issues?  | ?
| Changelog updated?  | no
| Fixed tickets       | PIM-2210
| Doc PR              |