#173982 by pwolanin and chx: fix schema inconsistencies between a fresh Drupal 6 install and a Drupal 5 upgraded to Drupal 6