[2.0][DDC-34] Fixing issue with duplicate association mappings when dealing with mapped super classes
