resolution for #2415
initial checkin for #2229 polyglot tests should wait for index
Merge branch 'larkost/2229-polyglot-tests-should-wait-for-index' of https://github.com/rethinkdb/rethinkdb into larkost/2229-polyglot-tests-should-wait-for-index