Merge branch 'serializers' of git://github.com/johnnoone/salt into johnnoone-serializers

Conflicts:
	doc/topics/yaml/index.rst
Merge branch 'easier-writing-runners-doc' of git://github.com/felixhummel/salt into felixhummel-easier-writing-runners-doc

Conflicts:
	doc/ref/runners/index.rst
Merge pull request #11022 from olliewalsh/issue_11020

Fix issue 11020
Merge pull request #11023 from whiteinge/test_exception

Added exception and stack functions to the test module
Merge pull request #11024 from whiteinge/import_text

Added load_text filter and import_text tag to Jinja environment
Merge pull request #11025 from terminalmage/11001

Clear available pkgs cache when available packages are likely to have changed
Merge pull request #11034 from JensRantil/less-awkward-check_hash

Less awkward file.check_hash(...)
fix indentation in salt.output.highstate

************* Module salt.output.highstate
salt/output/highstate.py:126: [W0311(bad-indentation), ] Bad indentation. Found 15 spaces, expected 16
salt/output/highstate.py:130: [W0311(bad-indentation), ] Bad indentation. Found 15 spaces, expected 16
Merge pull request #11035 from regilero/fix_immutablelazyproxy

Fix #11003 TypeError: list/ImmutableLazyProxy on file.accumulated
Merge pull request #11040 from basepi/servicesfun

Add `sfun` to service.mod_watch for future compatibility
Merge pull request #11051 from cachedout/10951

Don't seek on named pipes.
Merge pull request #11053 from cvrebert/patch-1

fix indentation in salt.output.highstate
fix typo in modules.lxc.update_lxc_conf()

************* Module salt.modules.lxc
salt/modules/lxc.py:870: [E1101(no-member), update_lxc_conf] Instance of 'str' has no 'fomart' member
Merge pull request #11055 from cvrebert/patch-1

fix typo in modules.lxc.update_lxc_conf()
Fix bad import of glob
fix grammar in some lxc mod err msgs: exists -> exist
avoid shadowing outer exists() func in lxc module

************* Module salt.modules.lxc
salt/modules/lxc.py:520: [W0621(redefined-outer-name), start] Redefining name 'exists' from outer scope (line 616)
salt/modules/lxc.py:555: [W0621(redefined-outer-name), stop] Redefining name 'exists' from outer scope (line 616)
avoid shadowing templates() within lxc module

************* Module salt.modules.lxc
salt/modules/lxc.py:710: [W0621(redefined-outer-name), templates] Redefining name 'templates' from outer scope (line 700)
salt.modules.lxc: fix bug in saltify when container is not running
pkgrepo state: add missing import of `sys` module

************* Module salt.states.pkgrepo
salt/states/pkgrepo.py:303: [E0602(undefined-variable), managed] Undefined variable 'sys'
salt/states/pkgrepo.py:379: [E0602(undefined-variable), absent] Undefined variable 'sys'