Merge "Adding environment variables for salt minion"