minor merge fixes

src/Umbraco.Core/Models/Packaging/PackageAction.cs

@@ -27,7 +27,7 @@ namespace Umbraco.Core.Models.Packaging
             set => _runAt = value;
         }
 
-        public bool Undo //NOTE: Should thid default to "False"? but the documentation says default "True" (http://our.umbraco.org/wiki/reference/packaging/package-actions)
+        public bool Undo
         {
             get => _undo ?? true;
             set => _undo = value;

src/Umbraco.Web/Routing/PublishedRequest.cs

@@ -487,7 +487,7 @@ namespace Umbraco.Web.Routing
         /// </summary>
         // Note: we used to set a default value here but that would then be the default
         // for ALL requests, we shouldn't overwrite it though if people are using [OutputCache] for example
-        // see: https://our.umbraco.org/forum/using-umbraco-and-getting-started/79715-output-cache-in-umbraco-752
+        // see: https://our.umbraco.com/forum/using-umbraco-and-getting-started/79715-output-cache-in-umbraco-752
         internal HttpCacheability Cacheability { get; set; }
 
         /// <summary>