Fixes: U4-4624 Media cache hits the DB on every empty property, U4-4338 Umbraco fails to enumerate TypedMedia
Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0