ISPN-3367 ClusterTopologyManagerTest.testClusterRecoveryWithRebalance fails randomly

Lower MERGE2.max_interval to speed up merging.
ISPN-3965 Tests in org.infinispan.server.test.client.hotrod can fail due to NPE