Merge proposals dependent on lp://staging/~cjwatson/launchpad/celery-soft-timeout-improve-cleanup

1. celery-soft-timeout-improve-cleanup
2. Dependent merge proposals