Merge branch '2.3.x' into 2.4.x

Author: lhotari

grails-web/src/main/groovy/org/codehaus/groovy/grails/web/servlet/GrailsDispatcherServlet.java

@@ -365,13 +365,17 @@ public Locale getLocale() {
                 }
             }
             catch (ModelAndViewDefiningException ex) {
+                // Exceptions inside includes should propogate up so the original dispatcher handles the exception
+                if(WebUtils.isIncludeRequest(request)) throw ex;
                 handlerException = ex;
                 if (logger.isDebugEnabled()) {
                     logger.debug("ModelAndViewDefiningException encountered", ex);
                 }
                 mv = ex.getModelAndView();
             }
             catch (Exception ex) {
+                // Exceptions inside includes should propogate up so the original dispatcher handles the exception
+                if(WebUtils.isIncludeRequest(request)) throw ex;
                 handlerException = ex;
                 Object handler = mappedHandler == null ? null : mappedHandler.getHandler();
                 mv = processHandlerException(request, response, handler, ex);