backport from master branch to 41x branch for JBIDE-13942 >> jbosstools-4.1.0.Alpha2x