[PR5878] Update to improve maintability [PR5938 required]... (#5940)
[PR5878] Update to improve maintability [PR5938 required]... (#5940)

For this update to properly work [PR 5938](https://github.com/mattermost/platform/pull/5938) is required!
rickbatka/mattermost-webapp,rickbatka/mattermost-webapp,rickbatka/mattermost-webapp,rickbatka/mattermost-webapp