GRAILS-8237 added check to see if the datasource matches the session factory; still broken if the domain classes uses more than one datasource though
upgrade to datastore 1.1.4 release
update version to 2.1.4
Merge branch '2.1.x' of github.com:grails/grails-core into 2.1.x
update version to 2.2.1
Merge branch '2.1.x' into 2.2.x

Conflicts:
	build.gradle
	build.properties
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
update to 1.1.5 of datastore
Merge branch '2.1.x' into 2.2.x
Merge branch '2.2.x'

Conflicts:
	build.gradle
	build.properties
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
Merge branch 'master' of github.com:grails/grails-core