HHH-7948 - Fix and test
HHH-7930 Hibernate will crash with (custom) enum types when running with a logback.xml in debug mode
HHH-7948 - Fix and test
(cherry picked from commit d702dfbc8c2bbd22863d853ceb3640dd794764c2)
Merge remote-tracking branch 'upstream/4.1' into 4.1