to branch 'i2p.i2p' (head 0d7e18b693718b5924035d7a6f638ff0689af589)

    * RebuildRouterInfoJob: Don't run it
    * PublishLocalRouterInfoJob:
      - Delay for 5m at startup
      - Run every 20m (was 7.5m)

      - Don't bundle unneeded XML parser xercesImpl.jar for Jetty (1MB)
      - Don't include unneeded stuff in Copy, Delete, Exec.jar (300KB)

so we can do better error handling

Now works with or without 'shared clients' enabled.

      - Change default length to 2+0
      - Cleanup helper code
      - Stub out the following new options (C=client, S=server):
        + Access list (S)
        + Certificate type (S)
        + Encrypted LeaseSet (S)
        + New dest on idle restart (C)
        + Tunnel closure on idle (C)
        + Tunnel reduction on idle (C,S)

       Pass message timeout through new I2CP message
       SendMessageExpiresMessage, so that the router
       uses the same expiration as the streaming lib.
       Should help reliability.
     * I2CP:
       Implement new I2CP message ReconfigureSessionMessage.
       Will be used for tunnel reduction.

       also tweak ResendPacketEvent to prepare for PacketQueue sending timeout to I2CP

     * Routerconsole: Add configkeyring.jsp

            to branch 'i2p.i2p' (head 7a54e1c58b8cf2ad43830ddec6d404229e3e6e60)

            to branch 'i2p.i2p' (head c7655ab1094ca15b4485ea2ac66085e87e28b0d6)

      - Fix double completion message
      - Add crstrack