Fixes merge issues

src/Umbraco.Web/Scheduling/LogScrubber.cs

@@ -47,8 +47,7 @@ namespace Umbraco.Web.Scheduling
             using (DisposableTimer.DebugDuration<LogScrubber>(() => "Log scrubbing executing", () => "Log scrubbing complete"))
             {
                 Log.CleanLogs(GetLogScrubbingMaximumAge(_settings));
-            }
-            }
+            }           
         }
     }
 }

src/Umbraco.Web/Scheduling/ScheduledPublishing.cs

@@ -42,11 +42,10 @@ namespace Umbraco.Web.Scheduling
 
                 _isPublishingRunning = true;
 
-                var umbracoBaseUrl = ServerEnvironmentHelper.GetCurrentServerUmbracoBaseUrl(_appContext);
+                var umbracoBaseUrl = ServerEnvironmentHelper.GetCurrentServerUmbracoBaseUrl(_appContext, _settings);
 
                 try
-                {
-                    var umbracoBaseUrl = ServerEnvironmentHelper.GetCurrentServerUmbracoBaseUrl(_appContext, _settings);
+                {                    
 
                     if (string.IsNullOrWhiteSpace(umbracoBaseUrl))
                     {

src/Umbraco.Web/Scheduling/Scheduler.cs

@@ -100,10 +100,6 @@ namespace Umbraco.Web.Scheduling
             _scrubberRunner.Add(new LogScrubber(appContext, settings));
         }
 
-        private static void PerformLogScrub(ApplicationContext appContext)
-        {
-            _scrubberRunner.Add(new LogScrubber(appContext));
-        }
         /// <summary>
         /// This performs all of the scheduling on the one timer
         /// </summary>

src/Umbraco.Web/Umbraco.Web.csproj

@@ -493,7 +493,6 @@
     <Compile Include="Mvc\UmbracoVirtualNodeRouteHandler.cs" />
     <Compile Include="Routing\CustomRouteUrlProvider.cs" />
     <Compile Include="Routing\UrlProviderExtensions.cs" />
-    <Compile Include="Scheduling\TaskEventArgs.cs" />
     <Compile Include="Strategies\Migrations\ClearCsrfCookiesAfterUpgrade.cs" />
     <Compile Include="Strategies\Migrations\ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs" />
     <Compile Include="Strategies\Migrations\EnsureListViewDataTypeIsCreated.cs" />