Improve container entry deletion when destroying containers.
Misc itest fixes.