Support the new network-uri package

There is an #ifdef on the network version which becomes an #ifdef on the version of the new network-uri package, but it just checks whether the network_uri macro is defined because (a) if we are building with an older version of network it won't be and (b) if it *is* defined the version is sure to be new enough.