Fixes: U4-5273 6.2: Umbraco.Field no longer rendering macro container
Merge branch '6.2.2' of https://github.com/umbraco/Umbraco-CMS into 6.2.2