Prevent exit() call from mcollective on rpc_client connect error, throw
appropriate exception
Merge branches 'bug-916809' and 'scl-fixes-1' into bug-916809