Fixes: #U4-2343 for api controllers, already fixed for surface controllers
Merge branch '6.1.2' into 7.0.0

Conflicts:
	src/Umbraco.Web/WebBootManager.cs