merge of '743aa294fa15c3243bb6ad56d4de64f5eff15051'

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

...ressbook/java/src/net/i2p/addressbook/ConfigIterator.java

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

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

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

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