MAGETWO-33076: Prepare pull request

- fixed merge conflicts

Author: Maxim Medinskiy

app/code/Magento/Catalog/Model/Product/Image/Cache.php

@@ -7,7 +7,7 @@
 
 use Magento\Catalog\Helper\Image as ImageHelper;
 use Magento\Catalog\Model\Product;
-use Magento\Core\Model\Resource\Theme\Collection as ThemeCollection;
+use Magento\Theme\Model\Resource\Theme\Collection as ThemeCollection;
 use Magento\Framework\App\Area;
 use Magento\Framework\View\ConfigInterface;
 

dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Image/CacheTest.php

@@ -36,7 +36,7 @@ class CacheTest extends \PHPUnit_Framework_TestCase
     protected $config;
 
     /**
-     * @var \Magento\Core\Model\Resource\Theme\Collection|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Theme\Model\Resource\Theme\Collection|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $themeCollection;
 
@@ -63,7 +63,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->themeCollection = $this->getMockBuilder('Magento\Core\Model\Resource\Theme\Collection')
+        $this->themeCollection = $this->getMockBuilder('Magento\Theme\Model\Resource\Theme\Collection')
             ->disableOriginalConstructor()
             ->getMock();