A couple of batch unit tests
Remove line
Pylint fix
Mock LocalClient in batch unit tests
Pylint fix, again.
fix typo in modules.file.replace() docstring

************* Module salt.modules.file
salt/modules/file.py:1020: [W1401(anomalous-backslash-in-string), ] Anomalous backslash in string: '\s'. String constant might be missing an r prefix.
Merge pull request #14146 from cvrebert/patch-1

fix typo in modules.file.replace() docstring
avoid shadowing 'type' built-in in states.syslog_ng._is_all_element_has_type
Merge pull request #14147 from hulu/syslog-ng-type-shadowing

avoid shadowing 'type' built-in in states.syslog_ng
avoid shadowing built-in `buffer` type in states.syslog_ng._build_config

rename local var: buffer => buf
Merge pull request #14149 from hulu/syslog-ng-buffer-shadow

avoid shadowing built-in `buffer` type in states.syslog_ng._build_config
fix typos in doc/topics/tutorials/intro_scale.rst
Merge pull request #14151 from hulu/intro-scale-doc-copyedit

fix typos in doc/topics/tutorials/intro_scale.rst
Merge pull request #14139 from rallytime/batch_test

A couple of batch unit tests
Style fixes

Single quotes, plus fixed an apparent bug where "name" was passed as a
quoted string instead of a variable.
Merge pull request #14160 from terminalmage/style-fixes

Style fixes
Remove syslog_ng state/module, moving to salt-contrib
Merge pull request #14163 from terminalmage/move-syslog-ng-to-salt-contrib

Remove syslog_ng state/module, moving to salt-contrib
Revert "lxc refactor"
Merge pull request #14165 from saltstack/revert-14137-lxc

Revert "lxc refactor"