little fixes
Merge branch 'HHH-4910-functional' into HHH-4910

Conflicts:
	hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java