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
Merge pull request #17305 from jacksontj/2014.7

2014.7