Merge remote-tracking branch 'origin/MAGETWO-38011' into develop

Author: Victor Rad

app/code/Magento/Email/Model/Template.php

@@ -190,7 +190,7 @@ public function __construct(
         $this->_viewFileSystem = $viewFileSystem;
         $this->_emailFilterFactory = $emailFilterFactory;
         $this->_emailConfig = $emailConfig;
-        parent::__construct($context, $design, $registry, $appEmulation, $storeManager, $data);
+        parent::__construct($context, $design, $registry, $appEmulation, $storeManager, null, null, $data);
     }
 
     /**

app/code/Magento/Newsletter/Model/Template.php

@@ -117,7 +117,7 @@ public function __construct(
         \Magento\Framework\Filter\FilterManager $filterManager,
         array $data = []
     ) {
-        parent::__construct($context, $design, $registry, $appEmulation, $storeManager, $data);
+        parent::__construct($context, $design, $registry, $appEmulation, $storeManager, null, null, $data);
         $this->_storeManager = $storeManager;
         $this->_request = $request;
         $this->_filter = $filter;