MAGETWO-65736: Swatch attributes are not shown on category page

Author: ameysar

dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli.php

@@ -58,7 +58,9 @@ public function execute($command, $options = [])
      */
     private function prepareUrl($command, $options = [])
     {
-        $command .= ' ' . implode(' ', $options);
+        if ($options) {
+            $command .= ' ' . implode(' ', $options);
+        }
         return $_ENV['app_frontend_url'] . self::URL . '?command=' . urlencode($command);
     }
 }

dev/tests/functional/tests/app/Magento/Config/Test/TestStep/SetupConfigurationStep.php

@@ -96,10 +96,12 @@ public function run()
                 $config->persist();
                 $result = array_replace_recursive($result, $config->getSection());
             }
-            if ($this->flushCache) {
-                $this->cache->flush();
-            }
         }
+
+        if ($this->flushCache) {
+            $this->cache->flush();
+        }
+
         $config = $this->fixtureFactory->createByCode('configData', ['data' => $result]);
 
         return ['config' => $config];