Merge "Avoid Database::encodeExpiry, when simple timestamp is given"