merge of '44418e8f7048de3ac06833176b607d55afc94bdd'

apps/addressbook/java/src/net/i2p/addressbook/Daemon.java

...ddressbook/java/src/net/i2p/addressbook/DaemonThread.java

apps/addressbook/java/src/net/i2p/addressbook/Servlet.java

apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java

apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java

apps/i2psnark/java/src/org/klomp/snark/TrackerInfo.java

...2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

.../java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java

...i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java

...ole/java/src/net/i2p/router/web/ConfigClientsHandler.java

...sole/java/src/net/i2p/router/web/ConfigClientsHelper.java

.../routerconsole/java/src/net/i2p/router/web/NavHelper.java

...terconsole/java/src/net/i2p/router/web/NetDbRenderer.java

...terconsole/java/src/net/i2p/router/web/PluginStarter.java

...terconsole/java/src/net/i2p/router/web/PluginStopper.java

...sole/java/src/net/i2p/router/web/PluginUpdateChecker.java

...sole/java/src/net/i2p/router/web/PluginUpdateHandler.java

...sole/java/src/net/i2p/router/web/RouterConsoleRunner.java

...terconsole/java/src/net/i2p/router/web/WebAppStarter.java

apps/routerconsole/java/strings/Strings.java