Merge remote-tracking branch 'cloudant/revert-default-value-for-max_write_delay'