Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2

i18n/en.json

@@ -5982,10 +5982,6 @@
     "id": "store.sql_channel.delete.channel.app_error",
     "translation": "We couldn't delete the channel"
   },
-  {
-    "id": "store.sql_channel.extra_updated.app_error",
-    "translation": "Problem updating members last updated time"
-  },
   {
     "id": "store.sql_channel.get.existing.app_error",
     "translation": "We couldn't find the existing channel"