Fix indentation error in hold_pkg logic
Fix External Raet REfactoring bugs
Merge remote-tracking branch 'upstream/develop' into sam_raet_36
Merge pull request #11992 from SmithSamuelM/sam_raet_36

Fix many external Raet refactor bugs
Pass in correct names
Fix incorrect documentation
Revert "Fix filelisting infinite loops"

This reverts commit ef8043bf0bebebb26dfc9f4ca1c4569ed217edb0.
the site reload is breaking macos states!!!!

@basepi, if this line is in 2014 [please cherrypick
set ioflo verbose to 0, the noise is no longer needed by default
Don't show stack traces for zmq in raet
Add cli example
Fixed py-lint errors and also a merge bug with makedirs.
Renamed method to better reflect what it does.
Moved the external_ip grain into salt-contrib
Merge pull request #11997 from whiteinge/salt-remove-external_ip

Moved the external_ip grain into salt-contrib
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