modifying behaviour to reduce arguments
Merge pull request #11967 from borgstrom/pyobject_imports

Allow for "imports" within pyobjects files
Merge pull request #11971 from holmboe/finally-umask

Use finally clause for setting back umask
Merge pull request #11975 from techhat/genesis

New system bootstrap code
Merge pull request #11976 from cachedout/nodegroups_doc

Add note about master restart per nodegroups.
Merge pull request #11977 from simonfrid/feature/log_minion_pid

logging process id
Merge pull request #11984 from terminalmage/issue11889

Use /usr/local/etc/salt as fallback CONFIG_DIR only on FreeBSD
Merge pull request #11985 from toumorokoshi/specialCopy

Fixes #11966, clearer interface for files.copy
fixes #1192.

* Adding config file option for salt master configuration
Merge pull request #11987 from toumorokoshi/showtimeout

Add show_timeout option to master config
new parameter: 'registry' for NPM module
Fix traceback in docker.running state

This improves error reporting when invalidly-formatted input is
submitted from the docker.running state to the docker.start execution
fucntion.
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