Merge pull request #4877 from owncloud/feature/space_icon_color_brandable