MAGETWO-66554: fix #6961 #6971

 - Merge Pull Request #6971 from razbakov/magento2:patch-1

Author: vrann

app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php

@@ -21,7 +21,7 @@ protected function _getUrl()
         $url = false;
         if ($this->getValue()) {
             $url = $this->_urlBuilder->getBaseUrl(
-                \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
+                ['_type' => \Magento\Framework\UrlInterface::URL_TYPE_MEDIA]
             ) . 'catalog/product/' . $this->getValue();
         }
         return $url;