MAGETWO-56868: CLONE - Cannot save a product with images for the second time

- Static & unit test fixes.

Author: Hayder Sharhan

app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php

@@ -389,6 +389,7 @@ protected function setUp()
             ->getMock();
         $this->collectionFactoryMock = $this->getMockBuilder(\Magento\Framework\Data\CollectionFactory::class)
             ->disableOriginalConstructor()
+            ->setMethods(['create'])
             ->getMock();
         $this->mediaConfig = $this->getMock(\Magento\Catalog\Model\Product\Media\Config::class, [], [], '', false);
         $this->objectManagerHelper = new ObjectManagerHelper($this);

dev/tests/functional/tests/app/Magento/Config/Test/Block/System/Config/AdminForm.php

@@ -3,13 +3,12 @@
  * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Config\Test\Block\System\Config;
 
 use Magento\Mtf\Block\Form;
 use Magento\Mtf\Client\Locator;
 
- /**
+/**
  * Admin Security form in admin configurations.
  *
  * Locate Admin account sharing settings, see if its visible