Update the openstack ones so that they don't overlap devices in lab Add the MAAS plans that had been staged for a bit
