apply https://github.com/jbosstools/jbosstools-jst/pull/391 from vrubezhny in 4.2.x branch >> jbosstools-4.2.x