HHH-6613 - Removing CollectionPropertyMapper