solved ticket https://issues.jboss.org/browse/RAILO-2049
Merge remote-tracking branch 'origin/4.0' into 4.0