Merge "Restart salt-minion on config change"