Intermediate checkin - almost done...
Merge branch 'master' of https://github.com/rovarga/ietf-network-topology