Used full path in including clustering_utils.hpp.
fix for #2733 40 tests failing after upset->replace change

Note that there are two docs files that still need changing, but that will be handled separately once the docs are updated.
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next
Merge branch 'next' into daniel_clean_bench