[Java] Cherry-pick fixes.

Author: vyazelenko

aeron-driver/src/main/java/io/aeron/driver/DriverNameResolver.java

@@ -133,8 +133,8 @@ final class DriverNameResolver implements AutoCloseable, UdpNameResolutionTransp
 
         final UdpChannel resolverChannel =
             UdpChannel.parse("aeron:udp?endpoint=" +
-                NetworkUtil.formatAddressAndPort(localSocketAddress.getAddress(), localSocketAddress.getPort()),
-                delegateResolver);
+            NetworkUtil.formatAddressAndPort(localSocketAddress.getAddress(), localSocketAddress.getPort()),
+            delegateResolver);
         transport = new UdpNameResolutionTransport(resolverChannel, localSocketAddress, unsafeBuffer, ctx);
 
         neighborsCounter = ctx.countersManager().newCounter(

aeron-system-tests/src/test/java/io/aeron/UntetheredSubscriptionTest.java

@@ -28,6 +28,7 @@
 import io.aeron.test.driver.TestMediaDriver;
 import org.agrona.CloseHelper;
 import org.agrona.concurrent.UnsafeBuffer;
+import org.agrona.concurrent.status.CountersReader;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

aeron-system-tests/src/test/java/io/aeron/driver/DriverNameResolverTest.java

@@ -324,10 +324,10 @@ void shouldUseFirstAvailableBootstrapNeighbor()
 
         addDriver(TestMediaDriver.launch(
             setDefaults(new MediaDriver.Context())
-                .aeronDirectoryName(baseDir + "-B")
-                .resolverName("B")
-                .resolverInterface("0.0.0.0:8051")
-                .resolverBootstrapNeighbor("just:wrong,non_existing_host:8050,localhost:8050,localhost:8051"),
+            .aeronDirectoryName(baseDir + "-B")
+            .resolverName("B")
+            .resolverInterface("0.0.0.0:8051")
+            .resolverBootstrapNeighbor("just:wrong,non_existing_host:8050,localhost:8050,localhost:8051"),
             testWatcher));
         startClients();
 
@@ -509,8 +509,8 @@ private int awaitNeighborsCounterId(final String name)
         while (true)
         {
             for (int offset = 0, counterId = 0, capacity = metaDataBuffer.capacity();
-                 offset < capacity;
-                 offset += METADATA_LENGTH, counterId++)
+                offset < capacity;
+                offset += METADATA_LENGTH, counterId++)
             {
                 final int recordStatus = metaDataBuffer.getIntVolatile(offset);
                 if (RECORD_ALLOCATED == recordStatus)
@@ -543,8 +543,8 @@ private int awaitCacheEntriesCounterId(final String name)
         while (true)
         {
             for (int offset = 0, counterId = 0, capacity = metaDataBuffer.capacity();
-                 offset < capacity;
-                 offset += METADATA_LENGTH, counterId++)
+                offset < capacity;
+                offset += METADATA_LENGTH, counterId++)
             {
                 final int recordStatus = metaDataBuffer.getIntVolatile(offset);
                 if (RECORD_ALLOCATED == recordStatus)