Add container garbage collection.
Merge pull request #2041 from brendandburns/release-0.4

Cherrypick Garbage Collection into the 0.4 release.