pillar/django_orm.py: copyedits
Minor docstring changes to publish.py
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.