Add timeouts to 2i queries

Depends on https://github.com/basho/riak_pb/pull/50 and https://github.com/basho/riak_kv/pull/616