MAGETWO-32016: Payment API for the Payments in US and CA

- fixed parent child merge defect with inheritance

Author: dkvashninbay

app/code/Magento/Payment/Model/Method/Free.php

@@ -103,7 +103,7 @@ public function isAvailable($quote = null)
      * @param \Magento\Quote\Model\Quote|null $quote
      * @return bool
      */
-    public function isActive($quote = null)
+    public function isAvailableInConfig($quote = null)
     {
         return parent::isAvailable($quote);
     }

app/code/Magento/Payment/Model/MethodList.php

@@ -55,7 +55,7 @@ public function getAvailableMethods(\Magento\Quote\Api\Data\CartInterface $quote
         if (!$isFreeAdded) {
             /** @var \Magento\Payment\Model\Method\Free $freeMethod */
             $freeMethod = $this->paymentHelper->getMethodInstance(Free::PAYMENT_METHOD_FREE_CODE);
-            if ($freeMethod->isActive()) {
+            if ($freeMethod->isAvailableInConfig()) {
                 $freeMethod->setInfoInstance($quote->getPayment());
                 $methods[] = $freeMethod;
             }