Merge release-3.10 into master (#6654)

* PLT-6787 Fixed being able to send a post before files finished uploading (#6617)

* Fix quick switcher for channels/users not stored locally (#6610)

* Fix button text on confirm mention modal (#6609)

* fix post delete permission of channel admin (#6608)

* open comment thread for the most recent reply-able message (#6605)

* Use mutex flag with yarn to prevent concurrent builds interfering (#6619)

* Use mutex flag with yarn to prevent concurrent builds interfering

* Remove yarn mutex file with clean

* Minor bug fixes (#6615)

* PLT-6774 - Fixing color for offline icon

* PLT-6784 - Fixing status icon

* Fixing icon margin

* Updating caret position

* PLT-6070 Have ChannelMentionProvider stop searching after a term returns no results (#6620)

* Fixing JS error (#6623)

* Minor bug fixes (#6622)

* PLT-6808 - Updating channel switcher on mobile

* PLT-6743 - Updating scrollbar styling

* Login instead of failing if user exists in OAuth sign-up flow (#6627)

* PLT-6802 Disable team switcher (#6626)

* Disable team switcher

* Fix ESLint errors

* PLT-6807 Ensured select teams page can scroll on iOS (#6630)

* Do not redirect from account switch pages on 401 (#6631)

* Fixing loadtest command and renaming to /test (#6624)

* PLT-6820 Update mattermost-redux dependency (#6632)

* translations PR 20170612 (#6629)

* Bump HTTP client timeout to 30 seconds (#6633)

* For team unreads return empty array instead of null (#6636)

* PLT-6831 Fix status modal localization IDs (#6637)

* Fix status modal localization IDs

* Update test snapshot

5 files changed, 21 insertions, 22 deletions

diff --git a/app/auto_users.go b/app/auto_users.go
index 71e20817d..c96321846 100644
--- a/app/auto_users.go
+++ b/app/auto_users.go
@@ -59,10 +59,10 @@ func (cfg *AutoUserCreator) createRandomUser() (*model.User, bool) {
 	var userEmail string
 	var userName string
 	if cfg.Fuzzy {
-		userEmail = "success+" + model.NewId() + "simulator.amazonses.com"
+		userEmail = "success+" + model.NewId() + "@simulator.amazonses.com"
 		userName = utils.FuzzName()
 	} else {
-		userEmail = "success+" + model.NewId() + "simulator.amazonses.com"
+		userEmail = "success+" + model.NewId() + "@simulator.amazonses.com"
 		userName = utils.RandomName(cfg.NameLength, cfg.NameCharset)
 	}
 
diff --git a/app/command_loadtest.go b/app/command_loadtest.go
index ad64573fc..20e6e0cdd 100644
--- a/app/command_loadtest.go
+++ b/app/command_loadtest.go
@@ -16,50 +16,50 @@ import (
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
-var usage = `Mattermost load testing commands to help configure the system
+var usage = `Mattermost testing commands to help configure the system
 
 	COMMANDS:
 
 	Setup - Creates a testing environment in current team.
-		/loadtest setup [teams] [fuzz] <Num Channels> <Num Users> <NumPosts>
+		/test setup [teams] [fuzz] <Num Channels> <Num Users> <NumPosts>
 
 		Example:
-		/loadtest setup teams fuzz 10 20 50
+		/test setup teams fuzz 10 20 50
 
 	Users - Add a specified number of random users with fuzz text to current team.
-		/loadtest users [fuzz] <Min Users> <Max Users>
+		/test users [fuzz] <Min Users> <Max Users>
 		
 		Example:
-			/loadtest users fuzz 5 10
+			/test users fuzz 5 10
 
 	Channels - Add a specified number of random channels with fuzz text to current team.
-		/loadtest channels [fuzz] <Min Channels> <Max Channels>
+		/test channels [fuzz] <Min Channels> <Max Channels>
 		
 		Example:
-			/loadtest channels fuzz 5 10
+			/test channels fuzz 5 10
 
 	Posts - Add some random posts with fuzz text to current channel.
-		/loadtest posts [fuzz] <Min Posts> <Max Posts> <Max Images>
+		/test posts [fuzz] <Min Posts> <Max Posts> <Max Images>
 		
 		Example:
-			/loadtest posts fuzz 5 10 3
+			/test posts fuzz 5 10 3
 
 	Url - Add a post containing the text from a given url to current channel.
-		/loadtest url
+		/test url
 		
 		Example:
-			/loadtest http://www.example.com/sample_file.md
+			/test http://www.example.com/sample_file.md
 
 	Json - Add a post using the JSON file as payload to the current channel.
-	        /loadtest json url
+	        /test json url
 
 		Example
-		/loadtest json http://www.example.com/sample_body.json
+		/test json http://www.example.com/sample_body.json
 
 `
 
 const (
-	CMD_LOADTEST = "loadtest"
+	CMD_TEST = "test"
 )
 
 type LoadTestProvider struct {
@@ -72,16 +72,16 @@ func init() {
 }
 
 func (me *LoadTestProvider) GetTrigger() string {
-	return CMD_LOADTEST
+	return CMD_TEST
 }
 
 func (me *LoadTestProvider) GetCommand(T goi18n.TranslateFunc) *model.Command {
 	return &model.Command{
-		Trigger:          CMD_LOADTEST,
+		Trigger:          CMD_TEST,
 		AutoComplete:     false,
 		AutoCompleteDesc: "Debug Load Testing",
 		AutoCompleteHint: "help",
-		DisplayName:      "loadtest",
+		DisplayName:      "test",
 	}
 }
 
diff --git a/app/command_shortcuts.go b/app/command_shortcuts.go
index 9eefb698e..e10ae8a87 100644
--- a/app/command_shortcuts.go
+++ b/app/command_shortcuts.go
@@ -46,7 +46,6 @@ func (me *ShortcutsProvider) DoCommand(args *model.CommandArgs, message string)
 		"api.command_shortcuts.nav.unread_prev",
 		"api.command_shortcuts.nav.unread_next",
 		"api.command_shortcuts.nav.switcher",
-		"api.command_shortcuts.nav.switcher_team",
 		"api.command_shortcuts.nav.direct_messages_menu",
 		"api.command_shortcuts.nav.settings",
 		"api.command_shortcuts.nav.recent_mentions",
diff --git a/app/team.go b/app/team.go
index 317315f06..0bed7e9a3 100644
--- a/app/team.go
+++ b/app/team.go
@@ -656,7 +656,7 @@ func GetTeamsUnreadForUser(excludeTeamId string, userId string) ([]*model.TeamUn
 		return nil, result.Err
 	} else {
 		data := result.Data.([]*model.ChannelUnread)
-		var members []*model.TeamUnread
+		members := []*model.TeamUnread{}
 		membersMap := make(map[string]*model.TeamUnread)
 
 		unreads := func(cu *model.ChannelUnread, tu *model.TeamUnread) *model.TeamUnread {
diff --git a/app/user.go b/app/user.go
index e5cc20568..6a6050cc8 100644
--- a/app/user.go
+++ b/app/user.go
@@ -269,7 +269,7 @@ func CreateOAuthUser(service string, userData io.Reader, teamId string) (*model.
 	}
 
 	if result := <-suchan; result.Err == nil {
-		return nil, model.NewLocAppError("CreateOAuthUser", "api.user.create_oauth_user.already_used.app_error", map[string]interface{}{"Service": service}, "email="+user.Email)
+		return result.Data.(*model.User), nil
 	}
 
 	if result := <-euchan; result.Err == nil {