Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-pr58

Author: zakdma

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

@@ -408,7 +408,9 @@ define([
          * @param {String} directive
          */
         makeDirectiveUrl: function (directive) {
-            return this.config['directives_url'].replace('directive', 'directive/___directive/' + directive);
+            var directivesUrl = this.config['directives_url'].split('?')[0];
+
+            return directivesUrl.replace('directive', 'directive/___directive/' + directive);
         },
 
         /**