Merge remote-tracking branch 'origin/MAGETWO-52653' into troll_p2

Author: rganin

app/code/Magento/Catalog/view/frontend/templates/product/list.phtml

@@ -89,7 +89,7 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
                                             </button>
                                         </form>
                                     <?php else: ?>
-                                        <?php if ($_product->getIsSalable()): ?>
+                                        <?php if ($_product->isAvailable()): ?>
                                             <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
                                         <?php else: ?>
                                             <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>