MAGETWO-34177: Simplification of Payment Configuration

- CR

Author: Dell-

app/code/Magento/Config/etc/system_include.xsd

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:redefine schemaLocation="system_file.xsd">
+        <xs:complexType name="configDeclaration">
+            <xs:sequence>
+                <xs:any minOccurs="0"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:redefine>
+</xs:schema>

lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/ResultFactory.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\View\TemplateEngine\Xhtml;
 
+use Magento\Framework\Phrase;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\ObjectManagerInterface;
 
@@ -53,7 +54,7 @@ public function create(array $arguments = [])
         $object = $this->objectManager->create($this->instanceName, $arguments);
 
         if (!($object instanceof ResultInterface)) {
-            throw new LocalizedException(__('This class must implement the "ResultInterface"'));
+            throw new LocalizedException(new Phrase('This class must implement the "ResultInterface"'));
         }
 
         return $object;