Merge branch 'develop' into FearlessKiwi-MAGETWO-59948

* develop:
  MAGETWO-62468: There is no Price on product page when product is out of stock

Author: VenkataUppalapati

app/code/Magento/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php

@@ -19,6 +19,6 @@ class SalableResolver implements SalableResolverInterface
      */
     public function isSalable(\Magento\Framework\Pricing\SaleableInterface $salableItem)
     {
-        return $salableItem->getCanShowPrice() !== false && $salableItem->isSalable();
+        return $salableItem->getCanShowPrice() !== false;
     }
 }

app/code/Magento/Catalog/Test/Unit/Model/Product/Pricing/Renderer/SalableResolverTest.php

@@ -22,7 +22,7 @@ protected function setUp()
     {
         $this->product = $this->getMock(
             \Magento\Catalog\Model\Product::class,
-            ['__wakeup', 'getCanShowPrice', 'isSalable'],
+            ['__wakeup', 'getCanShowPrice'],
             [],
             '',
             false
@@ -40,8 +40,6 @@ public function testSalableItem()
             ->method('getCanShowPrice')
             ->willReturn(true);
 
-        $this->product->expects($this->any())->method('isSalable')->willReturn(true);
-
         $result = $this->object->isSalable($this->product);
         $this->assertTrue($result);
     }
@@ -50,9 +48,7 @@ public function testNotSalableItem()
     {
         $this->product->expects($this->any())
             ->method('getCanShowPrice')
-            ->willReturn(true);
-
-        $this->product->expects($this->any())->method('isSalable')->willReturn(false);
+            ->willReturn(false);
 
         $result = $this->object->isSalable($this->product);
         $this->assertFalse($result);