Merge "Bug 872: Change cirros nsd to use mgmtnet as managment vld"