Merge remote-tracking branch 'origin/MAGETWO-36877' into MAGETWO-32004

Author: dkvashninbay

app/code/Magento/OfflinePayments/Block/Form/AbstractInstruction.php

@@ -20,12 +20,14 @@ abstract class AbstractInstruction extends \Magento\Payment\Block\Form
     /**
      * Get instructions text from config
      *
-     * @return string
+     * @return null|string
      */
     public function getInstructions()
     {
         if ($this->_instructions === null) {
-            $this->_instructions = $this->getMethod()->getInstructions();
+            /** @var \Magento\Payment\Model\Method\AbstractMethod $method */
+            $method = $this->getMethod();
+            $this->_instructions = $method->getConfigData('instructions');
         }
         return $this->_instructions;
     }

app/code/Magento/OfflinePayments/Test/Unit/Block/Form/AbstractInstructionTest.php

@@ -25,13 +25,13 @@ public function testGetInstructions()
     {
         $method = $this->getMock(
             'Magento\Payment\Model\MethodInterface',
-            ['getInstructions', 'getCode', 'getFormBlockType', 'getTitle'],
+            ['getConfigData', 'getCode', 'getFormBlockType', 'getTitle'],
             [],
             '',
             false
         );
         $method->expects($this->once())
-            ->method('getInstructions')
+            ->method('getConfigData')
             ->willReturn('instructions');
         $this->_model->setData('method', $method);