Merge remote-tracking branch 'trigger/AC-244' into AC-229

Author: krissyhiserote

lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter.js

@@ -196,6 +196,7 @@ define([
                 selector: '#' + this.getId(),
                 theme: 'silver',
                 skin: 'oxide',
+                'toolbar_mode': 'wrap',
                 'entity_encoding': 'raw',
                 'convert_urls': false,
                 'content_css': this.config.tinymce['content_css'],
@@ -272,6 +273,10 @@ define([
                 settings.skin = this.config.skin;
             }
 
+            if (this.config['toolbar_mode']) {
+                settings['toolbar_mode'] = this.config['toolbar_mode'];
+            }
+
             if (this.config.baseStaticUrl && this.config.baseStaticDefaultUrl) {
                 settings['document_base_url'] = this.config.baseStaticUrl;
             }