Support network 2.6.* and network-uri
Also support network 2.6/network-uri in the tests
Bump version to 4000.2.18