[JBIDE-15663] Merge branch 'master' into jbosstools-4.1.x