Create failing test for DDC-2645.

Merge not dealing correctly with composite primary keys.
[DDC-2645] Apply patch to fix issue
Merge branch 'DDC-2645' into 2.4