Merge branch '2.3-develop' into MAGETWO-91934

Author: Yevhen Miroshnychenko

app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php

@@ -5,7 +5,7 @@
  */
 
 /**
- * Mustishipping checkout base abstract block
+ * Multishipping checkout base abstract block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */

app/code/Magento/Multishipping/Block/Checkout/Shipping.php

@@ -9,7 +9,7 @@
 use Magento\Quote\Model\Quote\Address;
 
 /**
- * Mustishipping checkout shipping
+ * Multishipping checkout shipping
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php

@@ -15,9 +15,9 @@
  */
 class Discount extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
 {
-    //protected $_template = 'tax/checkout/subtotal.phtml';
-
-    //protected $_template = 'tax/checkout/subtotal.phtml';
+    /**
+     * @var \Magento\Tax\Model\Config
+     */
     protected $_taxConfig;
 
     /**

app/code/Magento/Ui/etc/di.xml

@@ -252,6 +252,7 @@
     <type name="Magento\Framework\Data\Argument\Interpreter\Composite">
         <arguments>
             <argument name="interpreters" xsi:type="array">
+                <item name="const" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\Constant</item>
                 <item name="object" xsi:type="object">configurableObjectArgumentInterpreterProxy</item>
                 <item name="configurableObject" xsi:type="object">configurableObjectArgumentInterpreterProxy</item>
                 <item name="array" xsi:type="object">arrayArgumentInterpreterProxy</item>

lib/internal/Magento/Framework/View/Layout/etc/layout_merged.xsd

@@ -62,4 +62,10 @@
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
+
+    <xs:complexType name="const">
+        <xs:complexContent>
+            <xs:extension base="argumentType" />
+        </xs:complexContent>
+    </xs:complexType>
 </xs:schema>

lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd

@@ -32,4 +32,10 @@
             <xs:field xpath="@name"/>
         </xs:unique>
     </xs:element>
+
+    <xs:complexType name="const">
+        <xs:complexContent>
+            <xs:extension base="argumentType" />
+        </xs:complexContent>
+    </xs:complexType>
 </xs:schema>