Merge with 4.11.6

src/Umbraco.Web/WebBootManager.cs

@@ -74,6 +74,19 @@ namespace Umbraco.Web
             return this;
         }
 
+        /// <summary>
+        /// Override this method in order to ensure that the UmbracoContext is also created, this can only be 
+        /// created after resolution is frozen!
+        /// </summary>
+        protected override void FreezeResolution()
+        {
+            base.FreezeResolution();
+
+            //before we do anything, we'll ensure the umbraco context
+            //see: http://issues.umbraco.org/issue/U4-1717
+            UmbracoContext.EnsureContext(new HttpContextWrapper(_umbracoApplication.Context), ApplicationContext);
+        }
+
         /// <summary>
         /// Override this method in order to ensure that the UmbracoContext is also created, this can only be 
         /// created after resolution is frozen!