Squashed 'apache-jasper/src/main/' changes from 3b05083..e800993

e800993 Align Commons Daemon options between service.bat and exe installer
51c7fcb Avoid possible deadlock when one thread tries to close a connection while another thread tries to write to it.
eca10d9 Fixing https://issues.apache.org/bugzilla/show_bug.cgi?id=56143 Update documentation and changelog.
3437da3 Avoid using the same path for "tomcat-juli.jar" twice  when CATALINA_HOME and CATALINA_BASE are the same.
c65c780 https://issues.apache.org/bugzilla/show_bug.cgi?id=56143 Allow service.bat to be launched from a non-UAC console, by using arguments instead of env variables to pass options to prunsrv.
8920cbf Simplify Windows *.bat files: remove %OS% checks, as current java does not run on ancient non-NT operating systems.
7d18276 Pick up DBCP 2 updates - performance improvement for validation queries - fix a threading bug under very heavy load
fd4c75c Followup to r1567717 Remove several other uses of compile.optimize property. The optimize flag is noop for current versions of javac (as Ant manual says).
255bbf1 Followup to r1567717 Remove several other uses of compile.optimize property, the optimize flag is noop for current versions of javac (as Ant manual says).
e11ee31 Keep pace with DBCP 2
ddd80f6 Log close code and reason when the Websocket connection is closed.
4951e52 Pick up latest JMX changes in DBCP. Individual connections are now registered for JMX.

git-subtree-dir: apache-jasper/src/main
git-subtree-split: e8009931adb1b7115d8bc1453d17a110d0cdc7b5
Merge commit '9cb65318892b9cb3b91e89dee911bff20039d810'

Conflicts:
	apache-jasper/src/main/bin/catalina.bat
	apache-jasper/src/main/bin/configtest.bat
	apache-jasper/src/main/bin/digest.bat
	apache-jasper/src/main/bin/service.bat
	apache-jasper/src/main/bin/shutdown.bat
	apache-jasper/src/main/bin/startup.bat
	apache-jasper/src/main/bin/tool-wrapper.bat
	apache-jasper/src/main/bin/version.bat
	apache-jasper/src/main/build.properties.default
	apache-jasper/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
	apache-jasper/src/main/modules/bayeux/build.xml
	apache-jasper/src/main/modules/jdbc-pool/build.properties.default
	apache-jasper/src/main/modules/jdbc-pool/build.xml
	apache-jasper/src/main/modules/tomcat-lite/build.xml
	apache-jasper/src/main/res/ide-support/netbeans/nb-tomcat.xml
	apache-jasper/src/main/res/tomcat.nsi
	apache-jasper/src/main/webapps/docs/appdev/build.xml.txt
	apache-jasper/src/main/webapps/docs/changelog.xml
	apache-jasper/src/main/webapps/docs/windows-service-howto.xml
	apache-jasper/src/main/webapps/examples/websocket/echo.xhtml
Squashed 'apache-el/src/main/' changes from 3b05083..e800993

e800993 Align Commons Daemon options between service.bat and exe installer
51c7fcb Avoid possible deadlock when one thread tries to close a connection while another thread tries to write to it.
eca10d9 Fixing https://issues.apache.org/bugzilla/show_bug.cgi?id=56143 Update documentation and changelog.
3437da3 Avoid using the same path for "tomcat-juli.jar" twice  when CATALINA_HOME and CATALINA_BASE are the same.
c65c780 https://issues.apache.org/bugzilla/show_bug.cgi?id=56143 Allow service.bat to be launched from a non-UAC console, by using arguments instead of env variables to pass options to prunsrv.
8920cbf Simplify Windows *.bat files: remove %OS% checks, as current java does not run on ancient non-NT operating systems.
7d18276 Pick up DBCP 2 updates - performance improvement for validation queries - fix a threading bug under very heavy load
fd4c75c Followup to r1567717 Remove several other uses of compile.optimize property. The optimize flag is noop for current versions of javac (as Ant manual says).
255bbf1 Followup to r1567717 Remove several other uses of compile.optimize property, the optimize flag is noop for current versions of javac (as Ant manual says).
e11ee31 Keep pace with DBCP 2
ddd80f6 Log close code and reason when the Websocket connection is closed.
4951e52 Pick up latest JMX changes in DBCP. Individual connections are now registered for JMX.

git-subtree-dir: apache-el/src/main
git-subtree-split: e8009931adb1b7115d8bc1453d17a110d0cdc7b5
Merge commit 'e181b9f81c1361b889b8dd5f628770e1aae258b7'

Conflicts:
	apache-el/src/main/bin/catalina.bat
	apache-el/src/main/bin/configtest.bat
	apache-el/src/main/bin/digest.bat
	apache-el/src/main/bin/service.bat
	apache-el/src/main/bin/shutdown.bat
	apache-el/src/main/bin/startup.bat
	apache-el/src/main/bin/tool-wrapper.bat
	apache-el/src/main/bin/version.bat
	apache-el/src/main/build.properties.default
	apache-el/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
	apache-el/src/main/modules/bayeux/build.xml
	apache-el/src/main/modules/jdbc-pool/build.properties.default
	apache-el/src/main/modules/jdbc-pool/build.xml
	apache-el/src/main/modules/tomcat-lite/build.xml
	apache-el/src/main/res/ide-support/netbeans/nb-tomcat.xml
	apache-el/src/main/res/tomcat.nsi
	apache-el/src/main/webapps/docs/appdev/build.xml.txt
	apache-el/src/main/webapps/docs/changelog.xml
	apache-el/src/main/webapps/docs/windows-service-howto.xml
	apache-el/src/main/webapps/examples/websocket/echo.xhtml