Revert unnecessary change from 826e7e4d66.

* Add documentation for logic of _OS_NAME_MAP and _OS_FAMILY_MAP
windows code review update thanks to @s0undt3ch
Merge pull request #3014 from FireHost/fix_debian_grains_again

Fix Debian grains again
Use the correct path to ZMQBaseError for older zmq versions

Fixes a FTBFS with older zmq I accidentally introduced.
Add basic Linux LVM support
Don't need re
Merge pull request #3011 from torhve/develop

Fix problem with attribute checks when data looks like:
Merge pull request #3013 from whiteinge/sysdoc-runner

Added sys.doc runner
Merge pull request #3018 from techhat/develop

Add basic Linux LVM support
Merge pull request #3019 from archtaku/issue3008

Force Gentoo-based distros to use full pkg name
Remove platform-specific code from pkg state

Platform-specific code from #3019 has been moved to pkg_resource module.
This code may evolve a bit down the road. Presently it will only check
syntax if the package is coming from the portage tree via ebuild.
However, future support for entropy (binary pkg manager), as well as
expanding syntax checking for binary package files should be considered
TODO items.
Merge pull request #3020 from archtaku/issue3008

Remove platform-specific code from pkg state
Only setup the console logger if we're not daemonizing. Fixes #3016.
Convert tabs to spaces. Refs #3015.
Don't touch closed ZMQ socket's and/or context's. Fixes #3015.

* On some occasions it seems that `salt.utils.event.SaltEvent.destroy()` is called twice and the errors exhibited on #3015 would show up on the second time we would try to set the linger socket option since that socket was already closed. So, even though on some parts of code which I changed in this commit weren't giving any problems, I ended up using the same recipe all around, if the socket is open, set the linger option and close it, plus, if open, also close the context.
Merge pull request #3023 from s0undt3ch/issues/3016

Only setup the console logger if we're not daemonizing. Fixes #3016.
Merge pull request #3024 from s0undt3ch/issues/3015

Fix #3015
Update hacking docs
Merge pull request #3026 from archtaku/docs

hacking docs: fix mixed up info on pid files
modules.useradd: use absolute path for copy.deepcopy

Otherwise, user.deepcopy shows up as an available function when
looking at the module docs for the user module via salt-call user -d