remove uses of org.hibernate.mapping.Collection
fix NPE during test run
remove uses of org.hibernate.mapping.Bag
remove uses of org.hibernate.mapping.DependantValue
remove uses of org.hibernate.mapping.IdentifierBag
remove uses of org.hibernate.mapping.List
remove uses of org.hibernate.mapping.Map