remove NOMERGE, looks fine (and is tested, so extra fine)

Author: DiannaHohensee

modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java

@@ -505,7 +505,6 @@ public void testMultipartUploadCleanup() {
                 .bucket(blobStore.bucket())
                 .key(blobStore.blobContainer(repository.basePath().add("test-multipart-upload")).path().buildAsString() + danglingBlobName)
                 .overrideConfiguration(
-                    // NOMERGE: check this conversion makes sense.
                     AwsRequestOverrideConfiguration.builder()
                         .putRawQueryParameter(S3BlobStore.CUSTOM_QUERY_PARAMETER_PURPOSE, OperationPurpose.SNAPSHOT_DATA.getKey())
                         .build()
@@ -518,7 +517,6 @@ public void testMultipartUploadCleanup() {
                 .bucket(blobStore.bucket())
                 .prefix(repository.basePath().buildAsString())
                 .overrideConfiguration(
-                    // NOMERGE: check this conversion makes sense.
                     AwsRequestOverrideConfiguration.builder()
                         .putRawQueryParameter(S3BlobStore.CUSTOM_QUERY_PARAMETER_PURPOSE, OperationPurpose.SNAPSHOT_DATA.getKey())
                         .build()