Merge branch '2014.7_sam4' of https://github.com/SmithSamuelM/salt into SmithSamuelM-2014.7_sam4
Lint 1
lint 2
Merge pull request #16193 from thatch45/SmithSamuelM-2014.7_sam4

Merge #16177