Merge proposals dependent on lp:~kalebral-deactivatedaccount/drizzle-automation/crash-me-remove-temp-limits

1. crash-me-remove-temp-limits
2. Dependent merge proposals