propagate from branch 'i2p.i2p.zzz.test' (head 589c4b0b77bdcbb49a965e39ec971c9b4bdd98c5)

apps/addressbook/java/src/addressbook/Daemon.java

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

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java

apps/jetty/java/src/org/mortbay/util/InetAddrPort.java

...src/net/i2p/client/streaming/I2PSocketManagerFactory.java

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

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

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

apps/routerconsole/jsp/configservice.jsp

apps/routerconsole/jsp/nav.jsp

apps/susimail/src/src/i2p/susi/webmail/WebMail.java

apps/systray/java/src/net/i2p/apps/systray/SysTray.java

apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java

core/java/src/net/i2p/client/I2PSessionImpl.java

core/java/src/net/i2p/util/EepGet.java

installer/resources/ahelper-conflict-header.ht

installer/resources/clients.config

installer/resources/dnf-header.ht

installer/resources/dnfb-header.ht

installer/resources/dnfh-header.ht