Merge branch 'MAGETWO-48642' of github.corp.magento.com:magento-troll/magento2ce into MAGETWO-43102

Author: slopukhov

app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php

@@ -234,8 +234,7 @@ public function imagePreprocessing($data)
     {
         if (!isset($_FILES) || (isset($_FILES['image']) && $_FILES['image']['name'] === '' )) {
             unset($data['general']['image']);
-            if (
-                isset($data['general']['savedImage']['delete']) &&
+            if (isset($data['general']['savedImage']['delete']) &&
                 $data['general']['savedImage']['delete']
             ) {
                 $data['general']['image']['delete'] = $data['general']['savedImage']['delete'];

app/code/Magento/Catalog/Model/Category.php

@@ -571,9 +571,9 @@ public function getStoreIds()
     public function getStoreId()
     {
         if ($this->hasData('store_id')) {
-            return $this->_getData('store_id');
+            return (int)$this->_getData('store_id');
         }
-        return $this->_storeManager->getStore()->getId();
+        return (int)$this->_storeManager->getStore()->getId();
     }
 
     /**