U4-1441 - refactor (fix) legacy NotFoundHandler support

src/Umbraco.Web/WebBootManager.cs

@@ -189,7 +189,9 @@ namespace Umbraco.Web
 						typeof (RenderControllerFactory)
 					});
 
-			ContentLastChanceFinderResolver.Current = new ContentLastChanceFinderResolver(new ContentFinderByLegacy404());
+            // the legacy 404 will run from within ContentFinderByNotFoundHandlers below
+            // so for the time being there is no last chance finder
+			ContentLastChanceFinderResolver.Current = new ContentLastChanceFinderResolver();
 
 			ContentFinderResolver.Current = new ContentFinderResolver(
 				//add all known resolvers in the correct order, devs can then modify this list on application startup either by binding to events
@@ -199,9 +201,11 @@ namespace Umbraco.Web
 						typeof (ContentFinderByPageIdQuery),
 						typeof (ContentFinderByNiceUrl),
 						typeof (ContentFinderByIdPath),
-						typeof (ContentFinderByNiceUrlAndTemplate),
-						typeof (ContentFinderByProfile),
-						typeof (ContentFinderByUrlAlias),
+                        // these will be handled by ContentFinderByNotFoundHandlers
+                        // so they can be enabled/disabled even though resolvers are not public yet
+						//typeof (ContentFinderByNiceUrlAndTemplate),
+						//typeof (ContentFinderByProfile),
+						//typeof (ContentFinderByUrlAlias),
                         typeof (ContentFinderByNotFoundHandlers)
 					});