Merge "Fix issue where pruned UsageStats files would not be removed from index"