NetDB: Ensure RI republish time is less than validation time

to prevent failures on connections esp. for hidden mode

router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java

@@ -46,7 +46,7 @@ public class PublishLocalRouterInfoJob extends JobImpl {
      *  floodfills since we store directly.
      *  Too long and the floodfill will drop us - timeout is 60 minutes.
      */
-    private static final long PUBLISH_DELAY = 52*60*1000;
+    private static final long PUBLISH_DELAY = 43*60*1000;
 
     /** this needs to be long enough to give us time to start up,
      *  but less than 20m (when we start accepting tunnels and could be a IBGW)

router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java

@@ -140,7 +140,7 @@ public abstract class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacad
     private final static long ROUTER_INFO_EXPIRATION_MIN = 90*60*1000l;
     private final static long ROUTER_INFO_EXPIRATION_SHORT = 75*60*1000l;
     private final static long ROUTER_INFO_EXPIRATION_FLOODFILL = 60*60*1000l;
-    private final static long ROUTER_INFO_EXPIRATION_INTRODUCED = 45*60*1000l;
+    private final static long ROUTER_INFO_EXPIRATION_INTRODUCED = 54*60*1000l;
     
     /**
      * Don't let leaseSets go too far into the future