Merging branch JBIDE-15430 into jbosstools-4.1.x