Merge "saltstack dependency refactoring"