Fix with salt in develop

[gtmanfred]

There were some issues with using salt.utils, we just need to catch that, and use the new location in salt.utils.

This should be pretty straight forward, try to import the new version, if it is not there, import the one from the old location.