Merge branch '2.4.x' into 2.5.x

Author: lhotari

build.gradle

@@ -22,7 +22,7 @@ ext {
 
     antTraxVersion = "1.7.1"
     antVersion = "1.8.4"
-    aspectjVersion = "1.8.2"
+    aspectjVersion = "1.8.4"
     commonsCliVersion = "1.2"
     commonsCollectionsVersion = "3.2.1"
     commonsIOVersion = "2.2"

grails-resources/src/grails/grails-app/conf/DataSource.groovy

@@ -8,8 +8,8 @@ dataSource {
 hibernate {
     cache.use_second_level_cache = true
     cache.use_query_cache = false
-//    cache.region.factory_class = 'net.sf.ehcache.hibernate.EhCacheRegionFactory' // Hibernate 3
-    cache.region.factory_class = 'org.hibernate.cache.ehcache.EhCacheRegionFactory' // Hibernate 4
+//    cache.region.factory_class = 'org.hibernate.cache.SingletonEhCacheRegionFactory' // Hibernate 3
+    cache.region.factory_class = 'org.hibernate.cache.ehcache.SingletonEhCacheRegionFactory' // Hibernate 4
     singleSession = true // configure OSIV singleSession mode
     flush.mode = 'manual' // OSIV session flush mode outside of transactional context
 }