Eas 1.4.2 2i timeout fix

Fixes necessary to make 2i timeout tests pass in the 1.4.2 release. You will need this to test https://github.com/basho/riak_kv/pull/644