MAGETWO-45113: Wrong url rewrites in catalog categories after changing url key for store view and moving category

Author: kandy

app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php

@@ -103,8 +103,7 @@ protected function generateForGlobalScope()
      */
     protected function isOverrideUrlsForStore($storeId, $categoryId)
     {
-        return $this->overrideStoreUrls
-            || !$this->storeViewService->doesEntityHaveOverriddenUrlKeyForStore(
+        return $this->overrideStoreUrls || !$this->storeViewService->doesEntityHaveOverriddenUrlKeyForStore(
             $storeId,
             $categoryId,
             Category::ENTITY