Merge "Adds Environment File for Removing Sahara during M/N upgrade"