merge client config into opts
trying to clean up the mess from the revert
Fix winrm mixin from revert merge