Implement the changes to make use of saltstack/salt#4530
Merge pull request #538 from s0undt3ch/develop

Implement the changes to make use of saltstack/salt#4530