Merge proposals dependent on lp:~ricgard/maas/bond-mounted-row-fix

lp:~ricgard/maas/bond-mounted-row-fix has no merge proposals.