Fix firewall token usage reporting to preserve raw counts and remove cache-rate transforms

Fix firewall token usage reporting to preserve raw counts and remove cache-rate transforms #2436