fixed merge conflict
fixed merge conflict

scrain/grails-spring-security-core,pergravgaard/grails-spring-security-core,pergravgaard/grails-spring-security-core,grails-plugins/grails-spring-security-core,tcrossland/grails-spring-security-core,lanyerzz/grails-spring-security-core,bhagwat/spring-security-forked-for-grails3,codeconsole/grails-spring-security-core,codeconsole/grails-spring-security-core,pergravgaard/grails-spring-security-core,hakanernam/grails-spring-security-core,grails-plugins/grails-spring-security-core,tcrossland/grails-spring-security-core,ColinHarrington/grails-spring-security-core,lanyerzz/grails-spring-security-core,tcrossland/grails-spring-security-core,bhagwat/spring-security-forked-for-grails3,tcrossland/grails-spring-security-core