add some generic types
solved ticket https://issues.jboss.org/browse/RAILO-2260
typo
solved ticket https://issues.jboss.org/browse/RAILO-2260
improve ObjectWrap handlinf in the Reflector
Merge branch '4.0' into develop

Conflicts:
	railo-java/railo-core/src/railo/runtime/cache/CacheSupport.java