Added NO_CPU_SHARDING option to build.mk.
Merge branch 'sam_v1.13.x_2821' into sam_2821
Merge branch 'sam_2821' of github.com:rethinkdb/rethinkdb into sam_2821