org.hibernate.test.annotations.indexcoll.IndexedCollectionTest#testEmbeddableWithEntityKey and testMapKeyEmbeddableWithEntityKey fixed in master and 5.0 branches.