Forward-port magento/graphql-ce#443 and magento/graphql-ce#1073

Author: lenaorobei

dev/tests/integration/testsuite/Magento/Swatches/_files/visual_swatch_attribute_with_different_options_type_rollback.php

@@ -32,4 +32,4 @@
     $swatchTypePath = $absolutePath . $swatchesMedia->getFolderNameSize($swatchType, $imageConfig) .
         '/' . $testImageName;
     $mediaDirectory->delete($swatchTypePath);
-}
+}