HHH-5465 - HQL left join fetch of an element collection following a left join fetch of a one-to-one relationship causes NullPointerException (testcase)
HHH-5465 - HQL left join fetch of an element collection following a left join fetch of a one-to-one relationship causes NullPointerException
HHH-8207 - Locale conversion is broken

Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/type/AttributeConverterTest.java
HHH-8207 - Locale conversion is broken

Conflicts:
	hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocaleTypeDescriptor.java