Merge pull request #817 from shenrie/master

Enhanced policy management tests
Refactored reset policy cache to use container management framework