Bug 989225 - the logic changed so that @container_dir is always set and @container_plugin is nil if the container no longer exists.
Merge pull request #3393 from rmillner/BZ989225

Merged by openshift-bot
Merge pull request #3397 from danmcp/master

Merged by openshift-bot