Updated to new OptionSet API and NetworkConfig.
Removed Eclipse files from git. Eclipse import existing Maven project will to the trick.