For
LDEV-1511 and
LDEV-1702- Update locales adds the Japanes language to the list iff it doesnt already exist
- update-core-database allows alter_21_engine.sql to fail, as tables may already be innodb and they may already have their foreign keys listed