merge of '174649506cd8a9665ad798c090e39481af967011'

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

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udp/UDPSink.java

...e/java/src/net/i2p/router/update/DevSU3UpdateChecker.java

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

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

core/java/src/net/i2p/data/PrivateKeyFile.java

history.txt

...ller/resources/certificates/plugin/cacapo_at_mail.i2p.crt

router/java/src/net/i2p/router/transport/ntcp/Reader.java