Merge proposals dependent on lp:~cjohnston/maas/1481118-apikey-doc-fix-1-8

lp:~cjohnston/maas/1481118-apikey-doc-fix-1-8 has no merge proposals.