Fix a bunch of RSIs
Merge branch 'tim/rsi-reql-admin-3233' into next
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next