Forward port of riak #338
Forward port of riak #361
Merge pull request #379 from basho/jd-cuttlefish

Forward ports of older open PRs to cuttlefish