Merge "Fix AttributeError with 'SSHExecCommandFailed'"