MC-13747: Update ShipmentValidationRequest to DHL 6.0 version

Author: Joan He

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

@@ -1418,8 +1418,8 @@ protected function _doRequest()
             '<req:ShipmentRequest' .
             ' xmlns:req="http://www.dhl.com"' .
             ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' .
-            ' xsi:schemaLocation="http://www.dhl.com ship-val-global-req-6.2.xsd"' .
-            ' schemaVersion="6.2" />';
+            ' xsi:schemaLocation="http://www.dhl.com ship-val-global-req-6.0.xsd"' .
+            ' schemaVersion="6.0" />';
         $xml = $this->_xmlElFactory->create(['data' => $xmlStr]);
 
         $nodeRequest = $xml->addChild('Request', '', '');
@@ -1433,10 +1433,6 @@ protected function _doRequest()
         $nodeServiceHeader->addChild('SiteID', (string)$this->getConfigData('id'));
         $nodeServiceHeader->addChild('Password', (string)$this->getConfigData('password'));
 
-        $nodeMetaData = $nodeRequest->addChild('MetaData');
-        $nodeMetaData->addChild('SoftwareName', $this->buildSoftwareName());
-        $nodeMetaData->addChild('SoftwareVersion', $this->buildSoftwareVersion());
-
         $originRegion = $this->getCountryParams(
             $this->_scopeConfig->getValue(
                 Shipment::XML_PATH_STORE_COUNTRY_ID,

app/code/Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml

@@ -6,18 +6,14 @@
  */
 -->
 <req:ShipmentRequest xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                     xsi:schemaLocation="http://www.dhl.com ship-val-global-req-6.2.xsd" schemaVersion="6.2">
+                     xsi:schemaLocation="http://www.dhl.com ship-val-global-req-6.0.xsd" schemaVersion="6.0">
     <Request xmlns="">
         <ServiceHeader>
             <MessageTime>currentTime</MessageTime>
             <MessageReference>MAGE_SHIP_28TO32_Char_CHECKED</MessageReference>
             <SiteID>some ID</SiteID>
             <Password>some password</Password>
         </ServiceHeader>
-        <MetaData>
-            <SoftwareName>Software_Product_Name_30_Char_</SoftwareName>
-            <SoftwareVersion>10Char_Ver</SoftwareVersion>
-        </MetaData>
     </Request>
     <RegionCode xmlns="">CHECKED</RegionCode>
     <RequestedPickupTime xmlns="">N</RequestedPickupTime>