Handle tearing down containers by env without sha properly.

This is kind of important; previously we'd ignore the environment and tear down everything.  This took cerberus down for about ten minutes this morning.

Tested in aquarium; seems to work fine.