Merge remote-tracking branch 'mainline/2.1.8-develop' into MAGETWO-66588

Author: duhon

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

@@ -347,7 +347,6 @@ define([
             // escape special chars in directives url to use it in regular expression
             var url = this.makeDirectiveUrl('%directive%').replace(/([$^.?*!+:=()\[\]{}|\\])/g, '\\$1');
             var reg = new RegExp(url.replace('%directive%', '([a-zA-Z0-9,_-]+)'));
-            content = decodeURIComponent(content);
 
             return content.gsub(reg, function(match) {
                 return Base64.mageDecode(match[1]);