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

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