HHH-6109 corrected @CollectionId#type handling
HHH-8962 allow PrimitiveTypeDescriptor to provide the actual Class