[jbosstools-dev] Merging/dual-commits on 2.0.x and trunk