Merge remote-tracking branch 'falcon/MAGETWO-48516' into MAGETWO-60931

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

@@ -200,8 +200,7 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
             if (
                 !$attributePath
                 || !$canDisplayUseDefault
-                || in_array($attributeCode, $this->elementsWithUseConfigSetting
-                )
+                || in_array($attributeCode, $this->elementsWithUseConfigSetting)
             ) {
                 continue;
             }