Update collation names.

React to the corresponding sql-layer branch. With this the tests all pass again, including server fixes for Rollback regression and view binary column size.