Sync changes

Sync changes with the original jbosstools-forge branch