saltstack/salt — pull request #18764 by jacksontj (2014-12-05 17:05:17+00:00)
Title: Channel/Sreq cleanup

Reapply non-importing changes from #18643.

I'll submit another one with the crypt and auth changes after fixing the import issues.