[jbosstools-dev] merge of helios to trunk - complete