[jbosstools-dev] Moved fix for from M1 to M2