Merge branch '2.2-develop' of github.com:magento/magento2ce into MC-17992

Author: NadiyaS

app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml

@@ -62,8 +62,8 @@
                                            name="ship[<?= $block->escapeHtml($_index) ?>][<?= $block->escapeHtml($_item->getQuoteItemId()) ?>][qty]"
                                            value="<?= $block->escapeHtml($_item->getQty()) ?>"
                                            size="2"
-                                           class="input-text qty"
-                                           data-validate="{number: true}"/>
+                                           class="input-text qty required-entry"
+                                           data-validate="{number: true, required:true}"/>
                                 </div>
                             </div>
                         </td>

app/code/Magento/Ups/Model/Carrier.php

@@ -1347,7 +1347,7 @@ protected function _formShipmentRequest(\Magento\Framework\DataObject $request)
             $shipperPart->addChild('PhoneNumber', $request->getShipperContactPhoneNumber());
 
             $addressPart = $shipperPart->addChild('Address');
-            $addressPart->addChild('AddressLine1', $request->getShipperAddressStreet());
+            $addressPart->addChild('AddressLine1', $request->getShipperAddressStreet1());
             $addressPart->addChild('AddressLine2', $request->getShipperAddressStreet2());
             $addressPart->addChild('City', $request->getShipperAddressCity());
             $addressPart->addChild('CountryCode', $request->getShipperAddressCountryCode());