Merge "Revert "Revert "Generate salt minion orchestration config"""