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