Merge proposals dependent on lp:~zriv/convoy/root-fix

lp:~zriv/convoy/root-fix has no merge proposals.