Merge proposals dependent on lp:~dobey/keeper/cleanup

lp:~dobey/keeper/cleanup has no merge proposals.