Cleanup: merge container-related jobs into daemon/ (Closes 7366)

Closes #7366

This adds a few fixes related to the renaming of `container_delete` -> `delete` and `changes` -> `container_changes`. I'm not sure why that was done. I can change that if justified.