propagate from branch 'i2p.i2p.zzz.test' (head f4edeaaf6cd647f4a69847a09272b54cb51ef758)

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java

...2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java

...nnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java

...tunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java

...ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSServer.java

.../java/src/net/i2p/i2ptunnel/socks/SOCKSServerFactory.java

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

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

apps/i2ptunnel/jsp/edit.jsp

apps/i2ptunnel/jsp/editClient.jsp

apps/i2ptunnel/jsp/editServer.jsp

apps/i2ptunnel/jsp/index.jsp

apps/jetty/build.xml

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

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

...outerconsole/java/src/net/i2p/router/web/NetDbHelper.java

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

apps/routerconsole/jsp/configkeyring.jsp

apps/routerconsole/jsp/confignav.jsp

apps/routerconsole/jsp/help.jsp