Merge proposals dependent on lp://qastaging/~charlesk/keeper/tar-creator-test-timer-increased

1. tar-creator-test-timer-increased
2. Dependent merge proposals