Merge pull request #12826 from cpuguy83/12825_fix_leftover_container_json

Fix undead containers