Don't issue spurious updates to machine_id_to_peer_id_map watchable on every single directory change.
Merge remote-tracking branch 'origin/tim_fix_scalability' into tim_scale_test