Index: win_installer/updater/src/ant/update-core-database.xml
===================================================================
diff -u -ra346e8c8f13dc57dfca4a13f75d0b4276969e207 -rc939ed4717ab29a8f5402970030834a267047f24
--- win_installer/updater/src/ant/update-core-database.xml	(.../update-core-database.xml)	(revision a346e8c8f13dc57dfca4a13f75d0b4276969e207)
+++ win_installer/updater/src/ant/update-core-database.xml	(.../update-core-database.xml)	(revision c939ed4717ab29a8f5402970030834a267047f24)
@@ -12,11 +12,24 @@
 			userid="${db.username}" 
 			password="${db.password}"
 			encoding="utf8"
-			onerror="continue">
+			onerror="abort">
 			<transaction src="${temp}/lams/sql/updateConfiguration.sql" />
 			<transaction src="${temp}/lams/sql/alter_21_branching.sql" />
-			<transaction src="${temp}/lams/sql/alter_21_engine.sql" />
 			<transaction src="${temp}/lams/sql/alter_21_groupings_fckeditor.sql" />
+			<transaction src="${temp}/lams/sql/updateLocales.sql" />
 		</sql>
+		
+		<!-- REMOVE BELOW FOR 2.2 -->
+		<echo></echo>
+		<echo>The below script will fail if the database tables are already INNODB, this will not affect the update.</echo>
+		<sql driver="com.mysql.jdbc.Driver" 
+            classpath="${jboss.deploy}/mysql-connector-java-3.1.12-bin.jar" 
+            url="${db.url}" 
+            userid="${db.username}" 
+            password="${db.password}"
+            encoding="utf8"
+            onerror="continue">
+            <transaction src="${temp}/lams/sql/alter_21_engine.sql" />
+        </sql>
 	</target>
 </project>
\ No newline at end of file
Index: win_installer/updater/src/sql/updateLocales.sql
===================================================================
diff -u
--- win_installer/updater/src/sql/updateLocales.sql	(revision 0)
+++ win_installer/updater/src/sql/updateLocales.sql	(revision c939ed4717ab29a8f5402970030834a267047f24)
@@ -0,0 +1,27 @@
+-- Fixing Japanese language string. See LDEV-1702
+-- checks if the languages in the language pack exist
+-- inserts rows into lams_supported_locale iff the languages dont exist
+drop table if exists locale_temp;
+
+create table locale_temp  (
+     language_iso_code VARCHAR(2) NOT NULL
+     , country_iso_code VARCHAR(2)
+     , description VARCHAR(255) NOT NULL
+     , direction VARCHAR(3) NOT NULL
+     , combined VARCHAR(5) NOT NULL
+     , fckeditor_code VARCHAR(10) 
+)TYPE=InnoDB;
+
+-- the combined column must be 'language_iso_code,country_iso_code' or 'language_iso_code'. It must match the value
+-- given by SELECT CONCAT_WS(',',l.language_iso_code,l.country_iso_code) FROM lams_supported_locale l
+INSERT INTO locale_temp (language_iso_code, country_iso_code, description, direction, combined, fckeditor_code) VALUES ('ja','JP','日本語','LTR','ja,JP', 'ja');
+
+INSERT INTO lams_supported_locale (language_iso_code, country_iso_code, description, direction, fckeditor_code) 
+(SELECT t.language_iso_code, t.country_iso_code, t.description, t.direction, t.fckeditor_code
+FROM locale_temp t WHERE t.combined NOT IN
+(SELECT CONCAT_WS(',',l.language_iso_code,l.country_iso_code) FROM lams_supported_locale l));
+drop table if exists locale_temp;
+
+-- Fixing Japanese language string. See LDEV-1702
+-- description description may be set to "Japanese (Japan)"
+UPDATE lams_supported_locale SET description='日本語' WHERE language_iso_code='ja' AND country_iso_code='JP';
\ No newline at end of file