HHH-7797 Simplified UniqueKey creation and corrected a couple of
@UniqueConstraint bugs.
Conflicts:
	hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java