Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB3649-move-manifest-stuff

# Conflicts:
#	src/Umbraco.Core/CompositionExtensions_Essentials.cs

src/Umbraco.Core/Models/Identity/UserLoginInfoWrapper.cs

@@ -0,0 +1,28 @@
+using Microsoft.AspNet.Identity;
+
+namespace Umbraco.Core.Models.Identity
+{
+    internal class UserLoginInfoWrapper : IUserLoginInfo
+    {
+        private readonly UserLoginInfo _info;
+
+        public static IUserLoginInfo Wrap(UserLoginInfo info) => new UserLoginInfoWrapper(info);
+
+        private UserLoginInfoWrapper(UserLoginInfo info)
+        {
+            _info = info;
+        }
+
+        public string LoginProvider
+        {
+            get => _info.LoginProvider;
+            set => _info.LoginProvider = value;
+        }
+
+        public string ProviderKey
+        {
+            get => _info.ProviderKey;
+            set => _info.ProviderKey = value;
+        }
+    }
+}