Merge remote-tracking branch 'origin/3.x'

Conflicts:
	grails-datastore-gorm-cassandra/src/test/groovy/org/grails/datastore/gorm/cassandra/plugin/support/CassandraSpringConfigurerSpec.groovy