merge of '522de7791fdad000d42bb5a01f139d913e74d7ef'

...le/java/src/net/i2p/router/web/ConfigAdvancedHandler.java

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

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

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

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

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

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

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

...console/java/src/net/i2p/router/web/ConfigNetHandler.java

...rconsole/java/src/net/i2p/router/web/ConfigNetHelper.java

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

...console/java/src/net/i2p/router/web/ConfigPeerHelper.java

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

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

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

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

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

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

...rconsole/java/src/net/i2p/router/web/ConfigUIHandler.java

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