Merge branch 'master' into bug2743

java/com.sap.sse.replication.testsupport/src/com/sap/sse/replication/testsupport/AbstractServerReplicationTestSetUp.java

@@ -179,13 +179,6 @@ public abstract class AbstractServerReplicationTestSetUp<ReplicableInterface ext
              * original exception propagate */
             logger.log(Level.SEVERE, "Exception trying to connect to initial load test servlet to STOP it", ex);
         }
-        synchronized (replicaReplicator.getReplicator()) {
-            while (!replicaReplicator.getReplicator().isQueueEmpty()) {
-                logger.info("Waiting for replication queue to drain...");
-                replicaReplicator.getReplicator().wait();
-            }
-        }
-        logger.info("Replication queue has been drained...");
     }
     
     /**