KRACOEUS-7369: fixing common and PD annotations
KRACOEUS-7369: code review comments
KRACOEUS-7369: code review comments
Merge pull request #291 from leoherbie/fix_jpa_standards

KRACOEUS-7369: fixing common and PD annotations