Merge "Ignore duplicate key errors in update-keys.sql"