LPS-40558 Make Validator consistent to use the same logic for Integer as Long