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

Implement the changes to make use of saltstack/salt#4530

The other commit,  I though it was already added.