[DDC-2660] Fix error with NativeSQL, ResultSetMappingBuilder and Associations as Primary Key.
Merge branch 'DDC-2660' into 2.4