Merge remote-tracking branch 'origin/4.0' into 4.1

Author: BalusC

impl/src/main/java/com/sun/faces/application/resource/ResourceHandlerImpl.java

@@ -216,6 +216,10 @@ public boolean isResourceRequest(FacesContext context) {
 
     @Override
     public String getRendererTypeForResourceName(String resourceName) {
+        if (resourceName == null) {
+            return null;
+        }
+
         String rendererType = null;
 
         String contentType = getContentType(FacesContext.getCurrentInstance(), resourceName);