Fix DDC-2012
Merge branch 'DDC-2012' into 2.2
Fix test case
[DDC-2059] Fix column and foreign key interfering with each other during reverse engineering.
Merge branch 'DDC-2059' into 2.2
Fixed bug with comment option not being added to column.
Merge branch 'DDC-2068' into 2.2
[DDC-2109] Fix bug with ResolveTargetEntityListener and ManyToMany associations.
Merge branch 'DDC-2148' into 2.2