Make sure all containers (even previously stopped) get a correct wait lock
Merge remote-tracking branch 'origin/wait_non_existing_container-fix'