Merge branch 'MAGETWO-61628' into 2.0-prs

Author: zakdma

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php

@@ -365,8 +365,7 @@ public function testExecute($categoryId, $storeId, $activeTabId, $parentId)
         );
 
         /**
-         * @var \Magento\Store\Model\Store
-         * |\PHPUnit_Framework_MockObject_MockObject $storeMock
+         * @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject $storeMock
          */
         $storeMock = $this->getMock(
             \Magento\Store\Model\Store::class,