Merge branch '4.0' into develop

Conflicts:
	railo-cfml/railo-admin/admin/debugging.templates.list.cfm
	railo-cfml/railo-admin/templates/error/error.cfm
	railo-java/railo-core/src/railo/runtime/Info.ini
	railo-java/railo-core/src/railo/runtime/config/ConfigImpl.java
	railo-java/railo-core/src/railo/runtime/config/ConfigWebFactory.java
	railo-java/railo-core/src/railo/runtime/functions/international/LSDateFormat.java
	railo-java/railo-core/src/railo/runtime/tag/Insert.java
	railo-java/railo-core/src/railo/runtime/tag/Query.java
	railo-java/railo-core/src/railo/runtime/tag/StoredProc.java
	railo-java/railo-core/src/railo/runtime/tag/Timer.java
	railo-java/railo-core/src/railo/runtime/tag/Update.java
	railo-java/railo-core/src/railo/runtime/type/util/KeyConstants.java
	railo-java/railo-core/src/resource/context/admin/debug/Classic.cfc
	railo-java/railo-core/src/resource/context/admin/debug/Modern.cfc
	railo-java/railo-core/src/resource/context/railo-context.ra
	railo-java/railo-core/src/resource/context/templates/error/error.cfm