merge of '18a7dd067a56c2552cf30f4a045628f91c360c80'

...addressbook/java/src/net/i2p/addressbook/AddressBook.java

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

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

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

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

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

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

...ok/java/src/net/i2p/addressbook/SubscriptionIterator.java

...ssbook/java/src/net/i2p/addressbook/SubscriptionList.java

apps/addressbook/web.xml

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

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

...unnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java

apps/routerconsole/java/bmsg.sh

apps/routerconsole/java/bundle-messages.sh

...onsole/java/src/net/i2p/router/web/ConfigPeerHandler.java

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

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

...java/src/net/i2p/router/web/ProfileOrganizerRenderer.java

...erconsole/java/src/net/i2p/router/web/ProfilesHelper.java