[jbosstools-dev] Merging 3.2.helios to trunk