Test import cleanup
Replace AtomicLongs in CachedKCVS with Metrics

This is the second half of #485