Merge pull request #11926 from vortec/npm_registry

npm state module: Add parameter to specify a custom NPM server
Allow for a 2nd system preparation sls file.
Add `versionadded` to registry support in NPM. Refs #11926.
Merge pull request #11998 from s0undt3ch/hotfix/npm-versionadded

Add `versionadded` to registry support in NPM. Refs #11926.
Fix E8251 unexpected spaces around keyword / parameter equals
Fix PEP8 E303: too many blank lines (3)
Merge pull request #11999 from s0undt3ch/hotfix/jenkins

Several Lint Fixes
Fix compound example.

Refs 11195cbd2da0f79d375a1b7ec4d37ca9c004e78c
Merge pull request #12000 from s0undt3ch/develop

Fix compound example.
Allow matching minions using compound match(ID + grains)
changed 'download' and 'install' to 'downloaded' and 'installed' to make it match intended state better.

made some minor changes to how name is used. If you want to address a single category of updates, you can now do it through the name, making name less vestigial. But if you want to have multiple categories, you still must do it through categories. and as such, categories still exists as an independent entity.
Log the commands being executed
changed occurances of 'win_updates' to 'win_update' for consistency.
Fix and quote the compound matcher
The default value is not `None`
Minor output changes
Fix remote reports downloads for minions grains matching.
Fix variable definition in wrong scope

File "/usr/lib/python2.7/dist-packages/salt/states/pkg.py", line 702
UnboundLocalError: local variable 'modified_hold' referenced before assignment
added runner pillar.show_pillar
Update pillar.py

PEP8 W391: blank line at end of file