Merge pull request #818 from shenrie/master

Refactored reset policy cache to use container management framework
Added trigger garbage collection in container management