fix indentation in states.selinux

************* Module salt.states.selinux
W0311: 33,0: Bad indentation. Found 12 spaces, expected 8
pillar.reclass_adapter: use "except X as Y" syntax
pillar/__init__.py: use modern "except X as Y" syntax
Merge pull request #5924 from cvrebert/patch-3

pillar/__init__.py: use modern "except X as Y" syntax
Merge pull request #5923 from cvrebert/patch-2

pillar.reclass_adapter: use "except X as Y" syntax
Merge pull request #5922 from cvrebert/patch-1

fix indentation in states.selinux
Fix oversights in addressing #5785

This commit catches up on changes introduced by
94d5c1797f1a3b6f5fa9fa4443b977715802a671. I overlooked some details and
this should now fix #5921 as well.

Closes: #5921
Signed-off-by: martin f. krafft <madduck@madduck.net>
Added bsd_shadow and portage_config execution/state module docs
Added git_pillar and updated reclass_adapter pillar/tops module docs
rST fixes in reclass docstrings
Allow listing a single module in a top match

This makes the following valid syntax for the top.sls file:

base:
  tommy.example.com:   webserver
  jerry.example.com:   dbserver
  alberon.example.com: mailserver

develop:
  saturn.example.com:  webserver
Add documentation for shorthand syntax
fix "DeprecationWarning: disable-msg is deprecated, replace it with disable" when running pylint
Clear cached service data at the beginning of service states

This fixes an edge case where service data has already been discovered
in another service state within the same highstate run, causing the
cached service data to be stored in __context__. If a package is then
installed which also adds a service, and a service state is run for that
service name, the list of available services will return cached data,
and salt will think that the service does not exist. By clearing the
cache at the beginning of the service states, we ensure that the most
up-to-date service information is used for service states.
Merge pull request #5931 from hulu/fix-deprecated-pylint-pragma-syntax

replace "disable-msg" with "disable" per DeprecationWarning
Merge pull request #5932 from terminalmage/issue5907

Clear cached service data at the beginning of service states
Merge pull request #5929 from jcassee/feature/top_scalars

Add single string shorthand for Top File
Merge pull request #5926 from madduck/ext_pillar_api_fixes_5785

Fix oversights in addressing #5785
Changing log level for file diff, it isn't critical
Don't allow npm state to be used if npm module not available

This prevents a traceback (as seen in #5934) when one tries to run an
npm state when the npm module is not available, by preventing the npm
state from loading using the __virtual__() function.