MAGETWO-46268: Contribute S73 to mainline

- Fix test and update composer .lock and .json files

Author: Gurzhyi, Andrii

app/code/Magento/BraintreeTwo/composer.json

@@ -11,7 +11,7 @@
         "magento/module-checkout": "*",
         "magento/module-sales": "*",
         "magento/module-backend": "*",
-        "braintree/braintree_php": "3.6.1"
+        "braintree/braintree_php": "3.7.0"
     },
     "type": "magento2-module",
     "version": "100.0.2",

app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php

@@ -77,7 +77,7 @@ public function render(AbstractElement $element)
             )->setForm(
                 $this->getForm()
             )->setLabel(
-                __('Size for %1', $attribute['title'])
+                __('Size for %1', __($attribute['title']))
             )->setRenderer(
                 $this->_formField
             );
@@ -93,7 +93,7 @@ public function render(AbstractElement $element)
             )->setForm(
                 $this->getForm()
             )->setLabel(
-                __('Watermark File for %1', $attribute['title'])
+                __('Watermark File for %1', __($attribute['title']))
             )->setRenderer(
                 $this->_formField
             );
@@ -109,7 +109,7 @@ public function render(AbstractElement $element)
             )->setForm(
                 $this->getForm()
             )->setLabel(
-                __('Position of Watermark for %1', $attribute['title'])
+                __('Position of Watermark for %1', __($attribute['title']))
             )->setRenderer(
                 $this->_formField
             )->setValues(

app/code/Magento/Catalog/etc/adminhtml/di.xml

@@ -16,19 +16,19 @@
         <arguments>
             <argument name="imageTypes" xsi:type="array">
                 <item name="small" xsi:type="array">
-                    <item name="title" xsi:type="string" translate="true">Small</item>
+                    <item name="title" xsi:type="string">Small</item>
                     <item name="attribute" xsi:type="string">small_image</item>
                 </item>
                 <item name="main" xsi:type="array">
-                    <item name="title" xsi:type="string" translate="true">Main</item>
+                    <item name="title" xsi:type="string">Main</item>
                     <item name="attribute" xsi:type="string">image</item>
                 </item>
                 <item name="cart" xsi:type="array">
-                    <item name="title" xsi:type="string" translate="true">Thumbnail</item>
+                    <item name="title" xsi:type="string">Thumbnail</item>
                     <item name="attribute" xsi:type="string">thumbnail</item>
                 </item>
                 <item name="custom" xsi:type="array">
-                    <item name="title" xsi:type="string" translate="true">Custom image</item>
+                    <item name="title" xsi:type="string">Custom image</item>
                     <item name="attribute" xsi:type="string">custom_image</item>
                 </item>
             </argument>

composer.json

@@ -44,7 +44,7 @@
         "pelago/emogrifier": "0.1.1",
         "tubalmartin/cssmin": "2.4.8-p4",
         "magento/magento-composer-installer": "*",
-        "braintree/braintree_php": "2.39.0",
+        "braintree/braintree_php": "3.7.0",
         "symfony/console": "~2.3 <2.7",
         "symfony/event-dispatcher": "~2.1",
         "phpseclib/phpseclib": "~0.3",