Change bitcask_qc_expirry merge to follow new expiry behavior