Bug 989225 - Check container_plugin

Bug 989225 - the logic changed so that @container_dir is always set and @container_plugin is nil if the container no longer exists.