Fix up merge

Author: DaveCTurner

test/framework/src/main/java/org/elasticsearch/repositories/blobstore/AbstractBlobContainerRetriesTestCase.java

@@ -541,13 +541,13 @@ public TestBlobContainerBuilder disableChunkedEncoding(@Nullable Boolean disable
             return this;
         }
 
-        public TestBlobContainerBuilder disableChunkedEncoding(@Nullable Boolean disableChunkedEncoding) {
-            this.disableChunkedEncoding = disableChunkedEncoding;
+        public TestBlobContainerBuilder maxConnections(@Nullable Integer maxConnections) {
+            this.maxConnections = maxConnections;
             return this;
         }
 
-        public TestBlobContainerBuilder maxConnections(@Nullable Integer maxConnections) {
-            this.maxConnections = maxConnections;
+        public TestBlobContainerBuilder bufferSize(@Nullable ByteSizeValue bufferSize) {
+            this.bufferSize = bufferSize;
             return this;
         }
 
@@ -562,7 +562,15 @@ public TestBlobContainerBuilder blobContainerPath(@Nullable BlobPath blobContain
         }
 
         public BlobContainer build() {
-            return createBlobContainer(maxRetries, readTimeout, disableChunkedEncoding, bufferSize, maxBulkDeletes, blobContainerPath);
+            return createBlobContainer(
+                maxRetries,
+                readTimeout,
+                disableChunkedEncoding,
+                maxConnections,
+                bufferSize,
+                maxBulkDeletes,
+                blobContainerPath
+            );
         }
     }