partally fixed issue https://issues.jboss.org/browse/RAILO-3232
Merge remote-tracking branch 'origin/4.2' into 4.2