Merge branch 'zj-create-mattermost-team' of gitlab.com:gitlab-org/gitlab-ce...

Merge branch 'zj-create-mattermost-team' of gitlab.com:gitlab-org/gitlab-ce into zj-create-mattermost-team