Merge branch '7.1.5_U4-5316' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-7.1.5_U4-5316

Conflicts:
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5
ensure even when using the legacy api that the icon for media folder is correct