US13383 #13396 Spring security configuration
US13383 #13396 Spring security configuration
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	grails-app/conf/DataSource.groovy