Issue 18845: Changes to data.sql to fix update.