Merge remote-tracking branch 'upstream/master' into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Add force_reload for debian_service, upstart and systemd and use it as default in mod_watch if available
Remove unused import.
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #2976 from herlo/develop

fixing typos is fun!
fixed typo s/locatime/localtime/
Merge pull request #2977 from cedwards/freebsd

fixed typo s/locatime/localtime/
Add style guide to the toc
List modules that aren't in the kernel folder.
Set linger on ZMQ sockets before closing, stops issues with `context.term()` hanging indefinitely. Refs #2958.

* Any unsent messages a socket which does not have `linger` set to a positive value, will make `context.term()` hang indefinitely. See https://github.com/zeromq/pyzmq/issues/102 for more info.
Improve modules check

There are actually two improvements here.
1) this.ko.bak and that.konan won't match anymore
2) Both lines become constant time opperations rather than having to seek from
   beggining to end of each string looking for the extension.
Add whitelist capability to the loader, fix#2903
Merge pull request #2979 from s0undt3ch/develop

Set linger on ZMQ sockets before closing
Fewer comments. Left the most important one in the proper place. Refs #2958.