Backport of PR #603 to 1.4 branch
Merge pull request #610 from basho/bugfix/jc/reip-update-claimant

Backport of PR #603 to 1.4 branch