saltstack/salt — pull request #15742 by thatch45 (2014-09-12 16:43:23+00:00)
Title: Merge #15695

Fix test bug and lint