JBIDE-15065: Merge jbosstools-4.0.x with master

Only soa related commits