Merge proposals dependent on lp:~robert-ancell/activity-log-manager/no-stock

lp:~robert-ancell/activity-log-manager/no-stock has no merge proposals.