Update registration number validation.

New validator matches any 6 or 7 digit number OR any 6 or 7 digit number
followed by 1 or 2 digits.