Properly updated NPN and ALPN files and configuration for JDK 7u65
and 8u20.
Merged branch 'master' into 'jetty-http2'.
Moved NPN module files in the right directory after merge.