Revert a few dict usage cleanups from #17080

Turns out our test coverage is missing a few things, upon closer inspection that change broke a few things that we don't seem to have test coverage for.
Merge branch '2014.7' of github.com:saltstack/salt into 2014.7
Add tests for SREQ class

revert keys() change to socket dicts since we will mutate the dict on iteration
remove comment from local debugging
Pylint fixes
Fix test failure
Merge branch 'issue_17000' into develop_17000

Conflicts:
	salt/master.py
Fix error in lvcreate (pv=None)
Re-enable setuptools `console_scripts`
factorize call
Merge pull request #17691 from makinacorpus/7

factorize call
Merge pull request #17305 from jacksontj/2014.7

2014.7
Merge pull request #17682 from fessoga5/2014.7

Fix error in lvcreate (pv=None)
integration test: known JID through netapi #15763
pre-emptive pylint fix0r
Making salt.utils.doc python3 compatible
Making salt.utils.files python3 compatible
Making salt.utils.jinja python3 compatible
Making salt.utils.raetevent python3 compatible
Removing all bad lists