Merge branch 'dev-v7.10' into temp-UAASSCRUM-1405

# Conflicts:
#	src/Umbraco.Web/Features/EnabledFeatures.cs

src/Umbraco.Web/Features/EnabledFeatures.cs

@@ -5,12 +5,7 @@ namespace Umbraco.Web.Features
     /// </summary>
     internal class EnabledFeatures
     {
-        /// <summary>
-        /// Specifies if rendering pipeline should ignore HasTemplate check when handling a request.
-        /// <remarks>This is to allow JSON preview of content with no template set.</remarks>
-        /// </summary>
-        public bool RenderNoTemplate { get; set; }
-
+        
         /// <summary>
         /// This allows us to inject html into the preview function extending the view with custom data.
         /// </summary>

src/Umbraco.Web/Features/UmbracoFeatures.cs

@@ -15,14 +15,7 @@ namespace Umbraco.Web.Features
         {
             Disabled = new DisabledFeatures();
         }
-
-        // note
-        // currently, the only thing a FeatureSet does is list disabled controllers,
-        // but eventually we could enable and disable more parts of Umbraco. and then
-        // we would need some logic to figure out what's enabled/disabled - hence it's
-        // better to use IsEnabled, where the logic would go, rather than directly
-        // accessing the Disabled collection.
-
+        
         /// <summary>
         /// Gets the disabled features.
         /// </summary>