Merge branch '4.2' into develop

Conflicts:
	railo-java/railo-core/src/railo/runtime/Info.ini
	railo-java/railo-core/src/railo/runtime/PageContextImpl.java
	railo-java/railo-core/src/railo/runtime/type/UDFPlus.java
	railo-java/railo-core/src/resource/context/railo-context.ra
	railo-java/railo-core/src/resource/library/tag/Dump.cfc