404283  org.eclipse.jetty.util.Scanner.scanFile() dies with an NPE if listFiles() returns null
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Merge remote-tracking branch 'origin/jetty-8'

Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java