TEIID-2969 addressing timestamp issues