[1.5.x] Fixed #19391 -- Oracle specific failure in tests

The failure was caused by using None as a choice for a CharField. To
avoid Oracle's "" <-> NULL handling the field type was changed to
IntegerField.

Backpatch of 632cf32b