Fixed in 5.1 branch as well.

After cherry-picking to 5.0 branch, CollectionCompositeElementExplicitConversionTest is failing with "org.hibernate.PropertyNotFoundException: Could not locate field name [attributeConverterDescriptor] on class [org.hibernate.mapping.SimpleValue]".

Maybe something else needs to be backported to 5.0 branch to get this to work.