HHH-9695 - Fix merge conflicts and checkStyle failure

hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/EntityRegionImpl.java

@@ -48,7 +48,8 @@ public class EntityRegionImpl extends BaseTransactionalDataRegion implements Ent
 			case TRANSACTIONAL:
 				if ( getCacheDataDescription().isMutable() ) {
 					return new TransactionalAccess( this );
-				} else {
+				}
+				else {
 					return new ReadOnlyAccess( this );
 				}
 			default:

hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/Caches.java

@@ -254,7 +254,8 @@ public class Caches {
 		CloseableIterator it = cache.keySet().iterator();
 		try {
 			while (it.hasNext()) {
-				it.next(); // Necessary to get next element
+				// Necessary to get next element
+				it.next();
 				it.remove();
 			}
 		}