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 error in lvcreate (pv=None)
Re-enable setuptools `console_scripts`
factorize call
Merge pull request #17691 from makinacorpus/7

factorize call
Updated aptpkg.mod_repo() module to properly add new PPAs. To determine if the PPA needs to be added, parse the return of get_repo() rather than trying to catch its exceptions.
Merge pull request #17305 from jacksontj/2014.7

2014.7
Merge pull request #17682 from fessoga5/2014.7

Fix error in lvcreate (pv=None)
Add function like check_managed() but that returns the changes
Return a changes dictionary for file.managed in test=true mode

Fixes #17939.
Fix salt.utils.chugid group_list filtering on OS X
Fix spelling in raet doc
Only read first line of minion_id, Fixes #17687
Merge pull request #17953 from rallytime/spelling_fix

Fix spelling in raet doc
wrap unittest doc at 80 chars
expand unittest docs: formal style, more examples