[Nsi-wg] NML topology file updates

People, The topology files in github are a bit of a mess and I have been fixing them up all day. If you are not dynamically downloading them you may want to pull and update. John.