Merge branch '3.x' Conflicts: grails-datastore-gorm-hibernate/src/test/groovy/org/codehaus/groovy/grails/orm/hibernate/CompositeIdentifierWithAssociationsTests.groovy grails-datastore-gorm-hibernate4/src/test/groovy/org/codehaus/groovy/grails/orm/hibernate/CompositeIdentifierWithAssociationsTests.groovy

diff --git a/grails-datastore-gorm-hibernate/src/test/groovy/org/codehaus/groovy/grails/orm/hibernate/CompositeIdentifierWithAssociationsTests.groovy b/grails-datastore-gorm-hibernate/src/test/groovy/org/codehaus/groovy/grails/orm/hibernate/CompositeIdentifierWithAssociationsTests.groovy
index ebaa2d2..a80ad14 100644
--- a/grails-datastore-gorm-hibernate/src/test/groovy/org/codehaus/groovy/grails/orm/hibernate/CompositeIdentifierWithAssociationsTests.groovy
+++ b/grails-datastore-gorm-hibernate/src/test/groovy/org/codehaus/groovy/grails/orm/hibernate/CompositeIdentifierWithAssociationsTests.groovy

@@ -82,6 +82,7 @@
 
 @Entity
 class CompositeIdentifierWithAssociationsParent implements Serializable, SomeTrait {
+    Long id
     Long version
 
     Set children

diff --git a/grails-datastore-gorm-hibernate4/src/test/groovy/org/codehaus/groovy/grails/orm/hibernate/CompositeIdentifierWithAssociationsTests.groovy b/grails-datastore-gorm-hibernate4/src/test/groovy/org/codehaus/groovy/grails/orm/hibernate/CompositeIdentifierWithAssociationsTests.groovy
index ebaa2d2..a80ad14 100644
--- a/grails-datastore-gorm-hibernate4/src/test/groovy/org/codehaus/groovy/grails/orm/hibernate/CompositeIdentifierWithAssociationsTests.groovy
+++ b/grails-datastore-gorm-hibernate4/src/test/groovy/org/codehaus/groovy/grails/orm/hibernate/CompositeIdentifierWithAssociationsTests.groovy

@@ -82,6 +82,7 @@
 
 @Entity
 class CompositeIdentifierWithAssociationsParent implements Serializable, SomeTrait {
+    Long id
     Long version
 
     Set children