Merge remote-tracking branch 'remotes/origin/MAGETWO-31559' into develop

Conflicts:
	app/code/Magento/Paypal/Helper/Shortcut/CheckoutValidator.php
	app/code/Magento/Paypal/Model/Express/Checkout.php
	app/code/Magento/Sales/Api/Data/OrderItemInterface.php
	dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php
	dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
	dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
	dev/tests/unit/testsuite/Magento/Paypal/Helper/Shortcut/CheckoutValidatorTest.php

Author: Kostiantyn Poida

app/code/Magento/Checkout/Block/Total/Nominal.php

@@ -86,7 +86,6 @@ public function isMultishippingCheckoutAvailable()
             true
         ) &&
             $quote->getItemsSummaryQty() - $quote->getItemVirtualQty() > 0 &&
-            $quote->getItemsSummaryQty() <= $this->getMaximumQty() &&
-            !$quote->hasNominalItems();
+            $quote->getItemsSummaryQty() <= $this->getMaximumQty();
     }
 }

app/code/Magento/Checkout/etc/sales.xml

@@ -49,7 +49,7 @@ public function getAllItems()
                     'parent_item' => $item->getParentItem(),
                     'name' => $item->getName(),
                     'qty' => (int)$item->getTotalQty(),
-                    'price' => $item->isNominal() ? 0 : (double)$item->getBaseCalculationPrice(),
+                    'price' => (double)$item->getBaseCalculationPrice(),
                     'original_item' => $item,
                 ]
             );

app/code/Magento/Checkout/view/frontend/templates/total/nominal.phtml

@@ -264,13 +264,7 @@ interface OrderItemInterface extends \Magento\Framework\Api\ExtensibleDataInterf
      * Base hidden tax refunded.
      */
     const BASE_HIDDEN_TAX_REFUNDED = 'base_hidden_tax_refunded';
-    /*
-     * Is-nominal flag.
-     */
     const IS_NOMINAL = 'is_nominal';
-    /*
-     * Tax-canceled flag.
-     */
     const TAX_CANCELED = 'tax_canceled';
     /*
      * Hidden-tax-canceled flag.
@@ -750,13 +744,6 @@ public function getHiddenTaxInvoiced();
      */
     public function getHiddenTaxRefunded();
 
-    /**
-     * Gets the is-nominal flag value for the order item.
-     *
-     * @return int Is-nominal flag value.
-     */
-    public function getIsNominal();
-
     /**
      * Gets the is-quantity-decimal flag value for the order item.
      *

app/code/Magento/Multishipping/Helper/Data.php

@@ -48,7 +48,7 @@ public function getTotalsRenderer($section, $group, $code)
 
     /**
      * Retrieve totals for group
-     * e.g. quote, nominal_totals, etc
+     * e.g. quote, etc
      *
      * @param string $section
      * @param string $group

app/code/Magento/Payment/Model/Cart/SalesModel/Quote.php

@@ -4,7 +4,7 @@
  */
 
 /**
- * Converts sales totals (incl. nominal, creditmemo, invoice) from \DOMDocument to array
+ * Converts sales totals (incl. creditmemo, invoice) from \DOMDocument to array
  */
 namespace Magento\Sales\Model\Config;
 

app/code/Magento/Sales/Api/Data/OrderItemInterface.php

@@ -4,7 +4,7 @@
  */
 
 /**
- * Sales configuration filesystem loader. Loads all totals (incl. nominal, creditmemo, invoice)
+ * Sales configuration filesystem loader. Loads all totals (incl. creditmemo, invoice)
  * configuration from XML file
  */
 namespace Magento\Sales\Model\Config;

app/code/Magento/Sales/Model/Config.php

@@ -18,7 +18,7 @@ public function getTotalsRenderer($section, $group, $code);
 
     /**
      * Retrieve totals for group
-     * e.g. quote, nominal_totals, etc
+     * e.g. quote, etc
      *
      * @param string $section
      * @param string $group