Merge branch 'release/2.1' into release/2.2

src/UI/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml

@@ -2,6 +2,7 @@
 @model ChangePasswordModel
 @{
     ViewData["Title"] = "Change password";
+    ViewData["ActivePage"] = ManageNavPages.ChangePassword;
 }
 
 <h4>@ViewData["Title"]</h4>

src/UI/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml

@@ -2,7 +2,7 @@
 @model DeletePersonalDataModel
 @{
     ViewData["Title"] = "Delete Personal Data";
-    ViewData["ActivePage"] = ManageNavPages.DeletePersonalData;
+    ViewData["ActivePage"] = ManageNavPages.PersonalData;
 }
 
 <h4>@ViewData["Title"]</h4>

src/UI/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml

@@ -2,7 +2,7 @@
 @model DownloadPersonalDataModel
 @{
     ViewData["Title"] = "Download Your Data";
-    ViewData["ActivePage"] = ManageNavPages.DownloadPersonalData;
+    ViewData["ActivePage"] = ManageNavPages.PersonalData;
 }
 
 <h4>@ViewData["Title"]</h4>

src/UI/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml

@@ -2,6 +2,7 @@
 @model ExternalLoginsModel
 @{
     ViewData["Title"] = "Manage your external logins";
+    ViewData["ActivePage"] = ManageNavPages.ExternalLogins;
 }
 
 <partial name="_StatusMessage" for="StatusMessage" />

src/UI/Areas/Identity/Pages/Account/Manage/Index.cshtml

@@ -2,6 +2,7 @@
 @model IndexModel
 @{
     ViewData["Title"] = "Profile";
+    ViewData["ActivePage"] = ManageNavPages.Index;
 }
 
 <h4>@ViewData["Title"]</h4>

src/UI/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml

@@ -2,6 +2,7 @@
 @model TwoFactorAuthenticationModel
 @{
     ViewData["Title"] = "Two-factor authentication (2FA)";
+    ViewData["ActivePage"] = ManageNavPages.TwoFactorAuthentication;
 }
 
 <partial name="_StatusMessage" for="StatusMessage" />