Merge remote-tracking branch 'cloudant/3184-retry-recompact-failure'