Defer reaps not prompted due to failure#1870

martinsumner wants to merge 2 commits intodevelop-3.0basho/riak_kv:develop-3.0from

mas-i1869-deferreapbasho/riak_kv:mas-i1869-deferreapCopy head branch name to clipboard