Merge pull request #2199 from rgarmsen2295/plt-1688

PLT-1688 Fixed issue with corrupted custom mentions on username change

store/sql_user_store.go

@@ -159,7 +159,7 @@ func (us SqlUserStore) Update(user *model.User, allowActiveUpdate bool) StoreCha
 						nonUsernameKeys = append(nonUsernameKeys, key)
 					}
 				}
-				user.NotifyProps["mention_keys"] = strings.Join(nonUsernameKeys, ",") + user.Username + ",@" + user.Username
+				user.NotifyProps["mention_keys"] = strings.Join(nonUsernameKeys, ",") + "," + user.Username + ",@" + user.Username
 			}
 
 			if count, err := us.GetMaster().Update(user); err != nil {