Adds the machine name and UUID to the "Server ready" message
Take deleted or conflicted names into account
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next
Merge branch 'next' into sam_2134_iii