KRACOEUS-7022 fixing several more mappings, some cleanup
KRACOEUS-7022 because "This class" does more than ...
KRACOEUS-7005 : Fixing integration test errors caused by recent changes.
KRACOEUS-7005 : Remove extra column from proposal person primary key.
Merge pull request #70 from leoherbie/jpa_changes

KRACOEUS-7022 fixing several more mappings, some cleanup
Merge pull request #71 from blackcathacker/key_personnel_add

Key personnel add - Integration and primary key fixes from PR #67