Merge remote-tracking branch 'mainline/2.1.1-develop' into 2.1-develop

Author: zakdma

AdobeStockImageAdminUi/Test/Unit/Controller/Adminhtml/Preview/DownloadTest.php

@@ -115,7 +115,7 @@ protected function setUp(): void
         $this->context->expects($this->once())
             ->method('getResultFactory')
             ->willReturn($this->resultFactory);
-        $this->saveImage->expects($this->once())->method('execute')->willReturn(null);
+        $this->saveImage->expects($this->once())->method('execute');
         $this->jsonObject = $this->createMock(Json::class);
         $this->resultFactory->expects($this->once())->method('create')->with('json')->willReturn($this->jsonObject);