Jbosstools 4.1.x merge master