Merge "Fixes including default SDN env file in deploy cmd"