Merge branches 'master' and 'local' into local
recompile gsoap stub without remotediscovery