Merge branch '4.0' into develop

Conflicts:
	railo-java/railo-core/src/railo/runtime/type/QueryColumnImpl.java
	railo-java/railo-core/src/railo/runtime/type/util/StructSupport.java