Index: source/ariba/overlay/BaseOverlay.cpp
===================================================================
--- source/ariba/overlay/BaseOverlay.cpp	(revision 5519)
+++ source/ariba/overlay/BaseOverlay.cpp	(revision 5521)
@@ -1530,11 +1530,11 @@
 
 		// keep alives and not up? yes-> link connection request is stale!
-		if ( !ld->up && difftime( now, ld->keepAliveTime ) > 2 ) {
+		if ( !ld->up && difftime( now, ld->keepAliveTime ) >= 2 ) {
 
 			// increase counter
 			ld->keepAliveMissed++;
 
-			// missed more than four keep-alive messages (4 sec)? -> drop link
-			if (ld->keepAliveMissed > 10) {
+			// missed more than four keep-alive messages (10 sec)? -> drop link
+			if (ld->keepAliveMissed > 4) {
 				logging_force( "Link connection request is stale, closing: " << ld );
 				oldlinks.push_back( ld );
@@ -1576,5 +1576,5 @@
 
 		if (ld->up!=1) continue;
-
+/*
 		vector<LinkID>::iterator it = std::find(
 				bootstrapLinks.begin(), bootstrapLinks.end(), ld->communicationId);
@@ -1584,4 +1584,5 @@
 			continue;
 		}
+*/
 		logging_force( "Link timed out. Dropping " << ld );
 		dropLink( ld->overlayId );