Update ICU to 54.1 step 1

source/common/ucln_cmn.h

Index: source/common/ucln_cmn.h
diff --git a/source/common/ucln_cmn.h b/source/common/ucln_cmn.h
index 1903127a6e717508531b9e75767324a050067198..3517ca78e614c8fb7e4431e9c25851d381f31d03 100644
--- a/source/common/ucln_cmn.h
+++ b/source/common/ucln_cmn.h
@@ -1,7 +1,7 @@
 /*
 ******************************************************************************
 *                                                                            *
-* Copyright (C) 2001-2013, International Business Machines                   *
+* Copyright (C) 2001-2014, International Business Machines                   *
 *                Corporation and others. All Rights Reserved.                *
 *                                                                            *
 ******************************************************************************
@@ -37,10 +37,11 @@ typedef enum ECleanupCommonType {
     UCLN_COMMON_BREAKITERATOR,
     UCLN_COMMON_BREAKITERATOR_DICT,
     UCLN_COMMON_SERVICE,
-    UCLN_COMMON_URES,
+    UCLN_COMMON_LOCALE_KEY_TYPE,
     UCLN_COMMON_LOCALE,
     UCLN_COMMON_LOCALE_AVAILABLE,
     UCLN_COMMON_ULOC,
+    UCLN_COMMON_LOADED_NORMALIZER2,
     UCLN_COMMON_NORMALIZER2,
     UCLN_COMMON_USET,
     UCLN_COMMON_UNAMES,
@@ -51,11 +52,20 @@ typedef enum ECleanupCommonType {
     UCLN_COMMON_PUTIL,
     UCLN_COMMON_LIST_FORMATTER,
     UCLN_COMMON_UINIT,
+
+    /*
+       Unified caches caches collation stuff. Collation data structures
+       contain resource bundles which means that unified cache cleanup
+       must happen before resource bundle clean up.
+    */
+    UCLN_COMMON_UNIFIED_CACHE,
+    UCLN_COMMON_URES,
     UCLN_COMMON_COUNT /* This must be last */
 } ECleanupCommonType;
 
 /* Main library cleanup registration function. */
 /* See common/ucln.h for details on adding a cleanup function. */
+/* Note: the global mutex must not be held when calling this function. */
 U_CFUNC void U_EXPORT2 ucln_common_registerCleanup(ECleanupCommonType type,
                                                    cleanupFunc *func);