fix syntax error in writing grains code snippet
Merge pull request #17183 from skosmalla/doc-grains-fix

fix syntax error in writing grains code snippet
Revert "Move the scheduler to its own process"
Add example for iptables policy

Add a missing example of iptables.set_policy. Also mention the `policy`
parameter explicitly in the documentation since there is no long option
equivalent in the iptables man page.
Merge pull request #17186 from viraptor/set_policy_comment

Add example for iptables policy
Add note to release notes about pillar/compound matching in mine/publish
Merge pull request #17195 from basepi/2014.7releasenotes

Add note to release notes about pillar/compound matching in mine/publish
Merge branch '2014.7' into develop
Merge pull request #17187 from saltstack/revert-17120-issue_17000

Revert "Move the scheduler to its own process"
tests/unit/utils/event_test.py: fix typo in comment
Merge pull request #17197 from cvrebert/patch-1

tests/unit/utils/event_test.py: fix typo in comment
pillar/file_tree.py: fix typo: "paramater" [sic]
Merge pull request #17199 from cvrebert/patch-1

pillar/file_tree.py: fix typo: "paramater" [sic]
fix a "typo"
Merge pull request #17201 from mgwilliams/sdb_memcache

memcached sdb module - it's not "Salt DB"