explicit merge of 'daa35ac8b482063c4db4b6205ca5dacc045080a4'

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

...nsole/java/src/net/i2p/router/web/SummaryBarRenderer.java

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

router/java/src/net/i2p/router/RouterVersion.java

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

...r/java/src/net/i2p/router/transport/udp/UDPTransport.java