Merge branch 'release-6.0.0' of github.com:/azure/azure-powershell into release-6.0.0

Author: markcowl

src/Common/Commands.Common.Authentication/AzureSessionInitializer.cs

@@ -105,13 +105,14 @@ static ContextAutosaveSettings InitializeSessionSettings(IDataStore store, strin
                         store.CreateDirectory(directoryPath);
                     }
                     string autoSavePath = Path.Combine(profileDirectory, settingsFile);
-                    store.WriteFile(autoSavePath, JsonConvert.SerializeObject(result));
                     result.Mode = ContextSaveMode.CurrentUser;
+                    store.WriteFile(autoSavePath, JsonConvert.SerializeObject(result));
                 }
             }
             catch
             {
                 // ignore exceptions in reading settings from disk
+                result.Mode = ContextSaveMode.Process;
             }
 
             return result;