Merge branch 'master' into PLT-1429

web/react/components/user_settings/import_theme_modal.jsx

@@ -55,6 +55,7 @@ export default class ImportThemeModal extends React.Component {
         theme.sidebarHeaderBg = colors[1];
         theme.sidebarHeaderTextColor = colors[5];
         theme.onlineIndicator = colors[6];
+        theme.awayIndicator = '#E0B333';
         theme.mentionBj = colors[7];
         theme.mentionColor = '#ffffff';
         theme.centerChannelBg = '#ffffff';