Merge "Fix test_storage_policy_quota_limit leaking containers"