Merge branch 'develop' of https://github.com/dmyerscough/salt into dmyerscough-develop
Add mkmnt logic
Merge pull request #15095 from thatch45/dmyerscough-develop

Merge #15055 with fixes