Additional fix for GRAILS-9954 and GRAILS-9956
Merge branch '2.2.x'

Conflicts:
	grails-web/src/main/groovy/org/codehaus/groovy/grails/web/servlet/GrailsControllerHandlerMapping.java
	grails-web/src/main/groovy/org/codehaus/groovy/grails/web/servlet/mvc/AbstractGrailsControllerHelper.java