saltstack/salt — pull request #19112 by jacksontj (2014-12-19 00:38:13+00:00)
Title: Fixup reactor in develop.

This includes a mash of #18762 and #19004
Effectively a sync of 2014.7 into this new file :)