Mattermost 3.5 config update

Followup to !1104 (merged) to add the new config options

Includes the commits from the parent merge request, so it should go in first.