Merge branch '4.0' into 4.1

Conflicts:
	railo-java/railo-core/src/railo/commons/lang/PhysicalClassLoader.java
	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/functions/displayFormatting/DateFormat.java
	railo-java/railo-core/src/railo/runtime/functions/displayFormatting/TimeFormat.java
	railo-java/railo-core/src/railo/runtime/functions/other/CreateDynamicProxy.java