saltstack/salt — pull request #15095 by thatch45 (2014-08-19 22:21:51+00:00)
Title: Merge #15055 with fixes

Add a check for mkmnt so that it is still honored