Merge branch 'master' into missing-path

client/coral-embed-stream/src/components/Embed.js

@@ -43,7 +43,7 @@ export default class Embed extends React.Component {
         {t('framework.my_profile')}
       </Tab>,
     ];
-    if (can(user, 'UPDATE_CONFIG')) {
+    if (can(user, 'UPDATE_ASSET_CONFIG')) {
       tabs.push(
         <Tab
           key="config"

client/coral-framework/services/perms.js

@@ -33,6 +33,7 @@ const basicRoles = {
 };
 
 const queryRoles = {
+  UPDATE_ASSET_CONFIG: [ADMIN, MODERATOR],
   UPDATE_CONFIG: [ADMIN],
   ACCESS_ADMIN: [ADMIN, MODERATOR],
   VIEW_USER_EMAILS: [ADMIN],