Merge proposals dependent on lp:~charlesk/keeper/reset-helper-stats-when-starting-a-new-task

1. reset-helper-stats-when-starting-a-new-task
2. Dependent merge proposals