HCOLL-58 VanillaSharedReplicatedHashMap additional cleanup