MAGETWO-53281: Update BN Codes for Braintree/PayPal

Author: oshmyheliuk

app/code/Magento/Paypal/Model/AbstractConfig.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\Paypal\Model;
 
-use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Payment\Model\Method\ConfigInterface;
 use Magento\Payment\Model\MethodInterface;
 use Magento\Store\Model\ScopeInterface;
@@ -50,11 +49,6 @@ abstract class AbstractConfig implements ConfigInterface
      */
     protected $pathPattern;
 
-    /**
-     * @var ProductMetadataInterface
-     */
-    private $productMetadata;
-
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      */
@@ -329,25 +323,10 @@ public function isMethodSupportedForCountry($method = null, $countryCode = null)
      */
     public function getBuildNotationCode()
     {
-        $bnCode = $this->_scopeConfig->getValue(
+        return $this->_scopeConfig->getValue(
             'paypal/bncode',
             ScopeInterface::SCOPE_STORE,
             $this->_storeId
         );
-        return sprintf($bnCode, $this->getProductMetadata()->getEdition());
-    }
-
-    /**
-     * The getter function to get the ProductMetadata
-     *
-     * @return ProductMetadataInterface
-     * @deprecated
-     */
-    protected function getProductMetadata()
-    {
-        if (!is_object($this->productMetadata)) {
-            $this->productMetadata = ObjectManager::getInstance()->get(ProductMetadataInterface::class);
-        }
-        return $this->productMetadata;
     }
 }

app/code/Magento/Paypal/etc/config.xml

@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
     <default>
         <paypal>
-            <bncode>Magento_Cart_%s</bncode>
+            <bncode>Magento_Cart_Community</bncode>
             <style>
                 <logo></logo>
             </style>