Merge branch 'master' into advanced-permissions-phase-2

i18n/en.json

@@ -6886,6 +6886,10 @@
     "id": "store.sql_role.get_by_names.app_error",
     "translation": "Unable to get roles"
   },
+  {
+    "id": "web.incoming_webhook.channel_locked.app_error",
+    "translation": "This webhook is not permitted to post to the requested channel"
+  },
   {
     "id": "store.sql_role.permanent_delete_all.app_error",
     "translation": "We could not permanently delete all the roles"