netaddr is now ordered-map
Fix and add tests associated with netaddr change
Feature version inc