t639: Change the sql script to have 19 and 20 veteran sensitive.
Merge branch 't639' into resolved