Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /*
  * pkix_pl_lifecycle.c
  *
  * Lifecycle Functions for the PKIX PL library.
  *
  */
 
@@ skipping 55 matching lines @@
     }
 
     return SECSuccess;
 }
 #endif /* PKIX_OBJECT_LEAK_TEST */
 
 
 PKIX_UInt32
 pkix_pl_lifecycle_ObjectLeakCheck(int *initObjCountTable)
 {
-        int   typeCounter = 0;
+        unsigned int typeCounter = 0;
         PKIX_UInt32 numObjects = 0;
         char  classNameBuff[128];
         char *className = NULL;
 
         for (; typeCounter < PKIX_NUMTYPES; typeCounter++) {
                 pkix_ClassTable_Entry *entry = &systemClasses[typeCounter];
                 PKIX_UInt32 objCountDiff = entry->objCounter;
 
                 if (initObjCountTable) {
                     PKIX_UInt32 initialCount = initObjCountTable[typeCounter];
@@ skipping 151 matching lines @@
 
         PKIX_RETURN(OBJECT);
 }
 
 /*
  * PKIX_PL_Shutdown (see comments in pkix_pl_system.h)
  */
 PKIX_Error *
 PKIX_PL_Shutdown(void *plContext)
 {
+#ifdef DEBUG
         PKIX_UInt32 numLeakedObjects = 0;
+#endif
 
         PKIX_ENTER(OBJECT, "PKIX_PL_Shutdown");
 
         if (!pkix_pl_initialized) {
             /* The library was not initilized */
             PKIX_RETURN(OBJECT);
         }
 
         PR_DestroyLock(classTableLock);
 
         pkix_pl_HttpCertStore_Shutdown(plContext);
 
+#ifdef DEBUG
         numLeakedObjects = pkix_pl_lifecycle_ObjectLeakCheck(NULL);
         if (PR_GetEnv("NSS_STRICT_SHUTDOWN")) {
            PORT_Assert(numLeakedObjects == 0);
         }
+#else
+        pkix_pl_lifecycle_ObjectLeakCheck(NULL);
+#endif
 
         if (plContext != NULL) {
                 PKIX_PL_NssContext_Destroy(plContext);
         }
 
         pkix_pl_initialized = PKIX_FALSE;
 
         PKIX_RETURN(OBJECT);
 }