to branch 'i2p.i2p' (head 6959293ce260b9da4d61776717c02e20a0c7b2dd)

      - Move the privkey files from the app dir to the
        config dir, in preparation for splitting the two
        dirs by default

      - Quote the jetty.xml path in clients.config,
        and adjust the migration function, to fix the
        eepsite-won't-start bug on windows

      - Restore the localhost error message
      - Catch 127.0.0.1:xxxx addresses too

      - Increase skew warning threshold to 3s (was 100ms)

      - Extend timeout to 20s (was 5s)
      - Shorten ping interval to 5m (was 10m)

      - Make getInt() static
      - Move the big TestSwarm class out of the lib