Transition taxonomy vocabulary settings from ID based to machine name based via database update after install.
Merge tag '7.x-1.2' of git://drupalcode.org/project/site_map