pillar/django_orm.py: copyedits
Minor docstring changes to publish.py
Don't fail if `salt._compat` cannot be imported. Refs #7426. Fixes #7425.
Make test more pythonic
Merge pull request #7430 from holmboe/pythonic-test

Make test more pythonic
Merge pull request #7428 from holmboe/publish-docstring

Whitespace & punctuation changes to docstring in publish.py
Merge pull request #7421 from cvrebert/patch-1

pillar/django_orm.py: copyedits
Merge pull request #7429 from s0undt3ch/develop

Don't fail if `salt._compat` cannot be imported. Refs #7426. Fixes #7425.
Fix `pep8` `W291` and `E231` issues.

* W291: Trailing white space
* E231: Missing white-space after comma.
Minor formatting changes. Double to single quotes.
Merge pull request #7431 from s0undt3ch/hotfix/lint

Fix `pep8` `W291` and `E231` issues.
Move jinja template files into salt/templates

See #7291. This is the first step.
Properly identify Raspbian
Use debian_service as service provider for Raspbian
Fix traceback in service.py when OS not identified

If the OS was not properly identified, salt/modules/service.py is used
as a fallback provider for the service module/state. However, the way it
looks up the location of the initscripts directory results in a
traceback if the OS grain isn't in the lookup dict.

This commit simplifies the lookup dict and has the module use
/etc/init.d as the location for initscripts if the 'os' grain is not in
the lookup dict, fixing this traceback.
Updated versions for file.replace file.search functions

This is going out with 0.17 instead of 0.17.1.
Shouldn't put a newline there
Merge pull request #7435 from holmboe/rh_ip-templates-dir

Move jinja template files into salt/templates
Merge pull request #7434 from terminalmage/issue7371

Properly identify Raspbian to fix service/pkg support
Merge branch 'develop' into with-pylint-pragmas