Fixes: U4-4892 Inconsistent (lack of) instructions regarding file extensions in the UI
Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5