Don't issue spurious updates to machine_id_to_peer_id_map watchable on every single directory change.
Merge branch 'reql_admin' of github.com:rethinkdb/rethinkdb into reql_admin