Bug 870171 - Part 31: Add PrunePolicyDatabaseStorage prune after cleanup tests.
Bug 870171 - Followup: Remove unnecessary curEnvID code.