Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate_custom_view_engines

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

src/Umbraco.Web/Mvc/ControllerContextExtensions.cs

@@ -22,6 +22,7 @@ namespace Umbraco.Web.Mvc
         /// <param name="controllerContext">The controller context.</param>
         /// <param name="dataTokenName">The name of the data token.</param>
         /// <returns>The data token, or null.</returns>
+        /// MIGRAGED TO NETCORE AS EXTENSION ON ActionContext
         internal static object GetDataTokenInViewContextHierarchy(this ControllerContext controllerContext, string dataTokenName)
         {
             var context = controllerContext;