Use 2i sort optional branch of riak_api
Add PB support, change http param name