U4-4373, U4-4374 - finalize fixes

Conflicts:
	src/Umbraco.Web/umbraco.presentation/CompatibilityHelper.cs