fixed directory lock in --daemon mode
Merge v1.7.2 into v1.7.x

RethinkDB 1.7.2
draft NOTES for 1.7.3
Merge v1.7.3 into next