Change hour-of-day exclude units to integers, not time with time zones (#23500)

* Change hour-of-day units to integers, not time with time zones

* Change display format of filter arguments to "h A"