Merge pull request #6013 from cvrebert/patch-3

__NewStyleClassMixIn => _NewStyleClassMixIn
Merge pull request #6012 from hulu/just-use-the-in-operator

Just use the `in` operator instead of mucking around with `str.find()`
Merge pull request #6014 from hulu/mcs

Fix metaclass __new__() parameter naming: cls ==> mcs
salt/utils/yamlloader.py: fix typos in comments
modules/yumpkg5.py: rm unused import of `os`

************* Module salt.modules.yumpkg5
W0611:  9,0: Unused import os
cli/caller.py: rm unused import of `yaml`

************* Module salt.cli.caller
W0611: 29,0: Unused import yaml
Merge pull request #6017 from cvrebert/patch-5

cli/caller.py: rm unused import of `yaml`
Merge pull request #6016 from cvrebert/patch-3

modules/yumpkg5.py: rm unused import of `os`
Merge pull request #6015 from cvrebert/patch-4

salt/utils/yamlloader.py: fix typos in comments
Merge pull request #6011 from cvrebert/patch-2

pillar/reclass_adapter.py: string.find(X) > -1 ==> X in string
Merge pull request #6010 from cvrebert/patch-1

tops/reclass_adapter.py: string.find(X) > -1 ==> X in string
Only Syndic minions have .local; push .local cleanup down into Syndic class

************* Module salt.minion
E1101:1126,16:Minion.destroy: Instance of 'Minion' has no 'local' member
minion.py: caps in comments
Merge pull request #6019 from cvrebert/patch-1

minion.py: caps in comments
Merge pull request #6018 from cvrebert/syndic-local-pylint

Only Syndic minions have .local; push .local cleanup down into Syndic class
Support pyvenv in virtualenv module
Fix mod_watch for supervisord state

The "update" param was not being taken into account by mod_watch,
causing parameters to be passed in the wrong order and ignoring the
"update" param altogether. This commit corrects that.

Fixes #6021.
Merge pull request #6028 from terminalmage/issue6021

Fix mod_watch for supervisord state
Merge pull request #6026 from extesy/patch-1

Support pyvenv in virtualenv module
Document defining custom grains in /etc/salt/grains