Merge branch 'MAGETWO-57153' into 2.1.8-develop-pr17

Author: OlgaVasyltsun

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php

@@ -314,7 +314,6 @@ public function testInitialize()
             ->method('getProductLinks')
             ->willReturn([]);
 
-
         $this->linkTypeProviderMock->expects($this->once())
             ->method('getItems')
             ->willReturn($this->assembleLinkTypes(['related', 'upsell', 'crosssell']));