saltstack/salt — pull request #17128 by thatch45 (2014-11-04 03:30:19+00:00)
Title: Merge #17072

Clean up the last lint on #17072