Merge proposals dependent on lp:~allenap/maas/device-api-1566109

lp:~allenap/maas/device-api-1566109 has no merge proposals.