Merge branch 'master' of github.com:airbytehq/airbyte into akorotkov/…

…6517-snowflake

� Conflicts:
�	airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/copy/s3/S3StreamCopier.java

airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/copy/s3/S3StreamCopier.java

@@ -50,7 +50,7 @@ public abstract class S3StreamCopier implements StreamCopier {
   private final ConfiguredAirbyteStream configuredAirbyteStream;
   private final Timestamp uploadTime;
   protected final String stagingFolder;
-  protected final Map<String, S3Writer> stagingWritersByFile = new HashMap<>();
+  protected final Map<String, DestinationFileWriter> stagingWritersByFile = new HashMap<>();
   protected final Set<String> activeStagingWriterFileNames = new HashSet<>();
   protected final Set<String> stagingFileNames = new LinkedHashSet<>();
   private final boolean purgeStagingData;