diff --git a/mozilla/security/nss/tests/memleak/ignored b/mozilla/security/nss/tests/memleak/ignored
index aaf46e73ae3..4efab9c60be 100644
--- a/mozilla/security/nss/tests/memleak/ignored
+++ b/mozilla/security/nss/tests/memleak/ignored
@@ -21,6 +21,7 @@ selfserv/SSL_ConfigSecureServer/PR_CallOnceWithArg/serverCAListSetup/CERT_GetSSL
 selfserv/main/server_main/SSL_ConfigSecureServer/PR_CallOnceWithArg/serverCAListSetup/CERT_GetSSLCACerts/PK11_TraverseSlotCerts/NSSTrustDomain_TraverseCertificates/nssPKIObjectCollection_Traverse/convert_cert/stan_GetCERTCertificate/nssTrust_GetCERTCertTrustForCert/nssTrustDomain_FindTrustForCertificate/nssToken_FindTrustForCertificate/find_objects_by_template/find_objects/*/*/*/*/*/*/PR_NewLock/PR_Calloc/calloc
 selfserv/PK11_TraverseSlotCerts/NSSTrustDomain_TraverseCertificates/nssPKIObjectCollection_Traverse/convert_cert/STAN_GetCERTCertificate/fill_CERTCertificateFields/nssTrust_GetCERTCertTrustForCert/nssTrustDomain_FindTrustForCertificate/nssToken_FindTrustForCertificate/*/*/*/*/*/PR_NewLock/calloc
 selfserv/NSSTrustDomain_TraverseCertificates/nssPKIObjectCollection_Traverse/convert_cert/STAN_GetCERTCertificate/fill_CERTCertificateFields/nssTrustDomain_FindTrustForCertificate/nssToken_FindTrustForCertificate/*/*/*/*/*/*/PR_NewLock/PR_Calloc/calloc
+ocspclnt/main/NSS_Init/SECMOD_LoadModule/SECMOD_LoadModule/SECMOD_LoadPKCS11Module/PK11_InitSlot/pk11_isRootSlot/pk11_FindObjectByTemplate/*/*/*/*/*/PR_NewLock/calloc
 
 #367374
 */main/PR_Init/_PR_ImplicitInitialization/**
@@ -50,22 +51,27 @@ selfserv/NSSTrustDomain_TraverseCertificates/nssPKIObjectCollection_Traverse/con
 */main/PR_Init/_PR_InitStuff/_PR_UnixInit/PR_NewLock/PR_Calloc/calloc
 */main/PR_Init/_PR_InitStuff/_PR_UnixInit/PR_NewMonitor/PR_Calloc/calloc
 */main/PR_Init/_PR_InitStuff/nspr_InitializePRErrorTable/PR_ErrorInstallTable/PR_Malloc/malloc
-ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitCMon/ExpandMonitorCache/PR_Calloc/calloc
-ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitCMon/ExpandMonitorCache/PR_NewMonitor/PR_Calloc/calloc
-ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitCMon/PR_NewLock/PR_Calloc/calloc
-ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitStuff/nspr_InitializePRErrorTable/PR_ErrorInstallTable/PR_Malloc/malloc
-ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitStuff/_PR_InitCMon/ExpandMonitorCache/PR_Calloc/calloc
-ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitStuff/_PR_InitCMon/ExpandMonitorCache/PR_NewMonitor/PR_Calloc/calloc
-ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitStuff/_PR_InitCMon/PR_NewLock/PR_Calloc/calloc
-ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitStuff/_PR_InitLinker/PR_Calloc/calloc
-ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitStuff/_PR_InitLinker/strdup/malloc
-ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitStuff/_PR_InitTPD/PR_Calloc/calloc
+ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/nspr_InitializePRErrorTable/PR_ErrorInstallTable/**
+ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitCMon/ExpandMonitorCache/**
+ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitCMon/ExpandMonitorCache/PR_NewMonitor/**
+ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitCMon/PR_NewLock/**
+ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitLinker/**
+ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitStuff/nspr_InitializePRErrorTable/PR_ErrorInstallTable/**
+ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitStuff/_PR_InitCMon/ExpandMonitorCache/**
+ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitStuff/_PR_InitCMon/ExpandMonitorCache/PR_NewMonitor/**
+ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitStuff/_PR_InitCMon/PR_NewLock/**
+ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitStuff/_PR_InitLinker/**
+ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitStuff/_PR_InitLinker/strdup/**
+ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitStuff/_PR_InitTPD/**
 ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitStuff/_PR_InitZones/pr_FindSymbolInProg/**
-ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitStuff/_PR_UnixInit/PR_NewLock/PR_Calloc/calloc
-ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitStuff/_PR_UnixInit/PR_NewMonitor/PR_Calloc/calloc
-ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitTPD/PR_Calloc/calloc
-ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_UnixInit/PR_NewLock/PR_Calloc/calloc
-ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_UnixInit/PR_NewMonitor/PR_Calloc/calloc
+ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitStuff/_PR_UnixInit/PR_NewLock/***
+ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitStuff/_PR_UnixInit/PR_NewMonitor/**
+ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitTPD/**
+ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_InitZones/dlopen@@GLIBC_2.1/**
+ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_UnixInit/PR_NewLock/**
+ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/_PR_UnixInit/PR_NewMonitor/**
+ocspclnt/main/PR_GetSpecialFD/_PR_UnixInit/PR_NewLock/**
+ocspclnt/main/PR_GetSpecialFD/_PR_UnixInit/PR_NewMonitor/**
 
 #367376
 selfserv/main/launch_threads/PR_CreateThread/_PR_CreateThread/pthread_create@@GLIBC_2.1/**
@@ -87,6 +93,7 @@ strsclnt/main/client_main/launch_thread/_PR_CreateThread/pthread_create@@GLIBC_2
 */main/*/*/SECMOD_LoadModule/SECMOD_LoadModule/SECMOD_LoadPKCS11Module/*/*/*/PR_CallOnce/*/pr_LoadLibraryByPathname/**
 */main/*/*/SECMOD_LoadModule/SECMOD_LoadModule/SECMOD_LoadPKCS11Module/*/*/*/PR_CallOnce/*/*/pr_LoadLibraryByPathname/**
 */main/*/*/SECMOD_LoadModule/SECMOD_LoadModule/SECMOD_LoadPKCS11Module/*/*/*/PR_CallOnce/*/*/*/pr_LoadLibraryByPathname/**
+ocspclnt/main/NSS_Init/SECMOD_LoadModule/SECMOD_LoadModule/SECMOD_LoadPKCS11Module/*/*/*/PR_CallOnce/*/*/pr_LoadLibraryByPathname/*
 
 #370536
 */main/NSS_Shutdown/STAN_Shutdown/NSSTrustDomain_Destroy/nssListIterator_Destroy/nssList_Destroy/NSSArena_Destroy/nssArena_Destroy/arena_remove_pointer/nssPointerTracker_remove/PL_HashTableRemove/PL_HashTableRawRemove/DefaultAllocTable/**
@@ -95,6 +102,7 @@ strsclnt/main/client_main/launch_thread/_PR_CreateThread/pthread_create@@GLIBC_2
 
 #391770
 */main/*/*/OCSP_InitGlobal/PR_NewMonitor/**
+ocspclnt/main/NSS_Init/OCSP_InitGlobal/PR_NewMonitor/*
 
 #391774
 */main/*/*/PKIX_Initialize/PKIX_PL_HashTable_Create/PKIX_PL_Mutex_Create/PKIX_PL_Object_Alloc/PKIX_PL_Malloc/**
@@ -108,6 +116,11 @@ strsclnt/main/client_main/launch_thread/_PR_CreateThread/pthread_create@@GLIBC_2
 */main/*/*/PKIX_Initialize/PKIX_PL_MonitorLock_Create/PKIX_PL_Object_Alloc/PKIX_PL_Malloc/**
 */main/*/*/PKIX_Initialize/PKIX_PL_MonitorLock_Create/PKIX_PL_Object_Alloc/PR_NewLock/**
 */main/*/*/PKIX_Initialize/PKIX_PL_MonitorLock_Create/PR_NewMonitor/**
+ocspclnt/main/NSS_Init/PKIX_Initialize/PKIX_PL_HashTable_Create/PKIX_PL_Mutex_Create/PKIX_PL_Object_Alloc/PKIX_PL_Malloc
+ocspclnt/main/NSS_Init/PKIX_Initialize/PKIX_PL_HashTable_Create/PKIX_PL_Object_Alloc/PKIX_PL_Malloc
+ocspclnt/main/NSS_Init/PKIX_Initialize/PKIX_PL_HashTable_Create/pkix_pl_PrimHashTable_Create/PKIX_PL_Malloc
+ocspclnt/main/NSS_Init/PKIX_Initialize/PKIX_PL_Initialize/PR_NewLock/calloc
+ocspclnt/main/NSS_Init/PKIX_Initialize/PKIX_PL_MonitorLock_Create/PKIX_PL_Object_Alloc/PKIX_PL_Malloc
 
 #393174
 ocspclnt/main/get_cert_status/CERT_CheckOCSPStatus/ocsp_GetOCSPStatusFromNetwork/ocsp_GetEncodedOCSPResponseForSingleCert/ocsp_GetEncodedOCSPResponseFromRequest/fetchOcspHttpClientV1/pkix_pl_HttpDefaultClient_RequestCreateFcn/pkix_pl_HttpDefaultClient_RequestCreate/pkix_HttpCertStore_FindSocketConnection/PKIX_PL_HashTable_Add/pkix_pl_PrimHashTable_Add/PKIX_PL_Malloc/**
@@ -119,6 +132,19 @@ ocspclnt/main/get_cert_status/CERT_CheckOCSPStatus/ocsp_GetOCSPStatusFromNetwork
 ocspclnt/main/get_cert_status/CERT_CheckOCSPStatus/ocsp_GetOCSPStatusFromNetwork/ocsp_GetEncodedOCSPResponseForSingleCert/ocsp_GetEncodedOCSPResponseFromRequest/fetchOcspHttpClientV1/pkix_pl_HttpDefaultClient_RequestCreateFcn/pkix_pl_HttpDefaultClient_RequestCreate/pkix_HttpCertStore_FindSocketConnection/pkix_pl_Socket_CreateByHostAndPort/PKIX_PL_Object_Alloc/PR_NewLock/**
 ocspclnt/main/get_cert_status/CERT_CheckOCSPStatus/ocsp_GetOCSPStatusFromNetwork/ocsp_GetEncodedOCSPResponseForSingleCert/ocsp_GetEncodedOCSPResponseFromRequest/fetchOcspHttpClientV1/pkix_pl_HttpDefaultClient_RequestCreateFcn/pkix_pl_HttpDefaultClient_RequestCreate/pkix_HttpCertStore_FindSocketConnection/pkix_pl_Socket_CreateByHostAndPort/pkix_pl_Socket_CreateClient/PR_NewTCPSocket/PR_Socket/pt_SetMethods/_PR_Getfd/**
 ocspclnt/get_cert_status/CERT_CheckOCSPStatus/ocsp_GetOCSPStatusFromNetwork/ocsp_GetEncodedOCSPResponseForSingleCert/ocsp_GetEncodedOCSPResponseFromRequest/fetchOcspHttpClientV1/pkix_pl_HttpDefaultClient_RequestCreateFcn/pkix_pl_HttpDefaultClient_RequestCreate/pkix_HttpCertStore_FindSocketConnection/pkix_pl_Socket_CreateByHostAndPort/pkix_pl_Socket_CreateClient/PR_NewTCPSocket/PR_Socket/pt_SetMethods/_PR_Getfd/**
+ocspclnt/main/CERT_CheckOCSPStatus/ocsp_GetEncodedOCSPResponseFromRequest/pkix_pl_HttpDefaultClient_RequestCreateFcn/pkix_pl_HttpDefaultClient_RequestCreate/pkix_HttpCertStore_FindSocketConnection/PKIX_PL_HashTable_Add/pkix_pl_PrimHashTable_Add/PKIX_PL_Malloc/**
+ocspclnt/main/CERT_CheckOCSPStatus/ocsp_GetEncodedOCSPResponseFromRequest/pkix_pl_HttpDefaultClient_RequestCreateFcn/pkix_pl_HttpDefaultClient_RequestCreate/pkix_HttpCertStore_FindSocketConnection/pkix_pl_Socket_CreateByHostAndPort/PKIX_PL_Object_Alloc/PKIX_PL_Malloc/**
+ocspclnt/main/CERT_CheckOCSPStatus/ocsp_GetEncodedOCSPResponseFromRequest/pkix_pl_HttpDefaultClient_RequestCreateFcn/pkix_pl_HttpDefaultClient_RequestCreate/pkix_HttpCertStore_FindSocketConnection/pkix_pl_Socket_CreateByHostAndPort/PKIX_PL_Object_Alloc/PR_NewLock/**
+ocspclnt/main/CERT_CheckOCSPStatus/ocsp_GetEncodedOCSPResponseFromRequest/pkix_pl_HttpDefaultClient_RequestCreateFcn/pkix_pl_HttpDefaultClient_RequestCreate/pkix_HttpCertStore_FindSocketConnection/pkix_pl_Socket_CreateByHostAndPort/pkix_pl_Socket_CreateClient/PR_NewTCPSocket/PR_Socket/pt_SetMethods/_PR_Getfd/**
+ocspclnt/main/CERT_CheckOCSPStatus/ocsp_GetEncodedOCSPResponseFromRequest/pkix_pl_HttpDefaultClient_RequestCreateFcn/pkix_pl_HttpDefaultClient_RequestCreate/pkix_HttpCertStore_FindSocketConnection/PKIX_PL_Sprintf/PKIX_PL_String_Create/pkix_EscASCII_to_UTF16/PKIX_PL_Malloc/**
+ocspclnt/main/CERT_CheckOCSPStatus/ocsp_GetEncodedOCSPResponseFromRequest/pkix_pl_HttpDefaultClient_RequestCreateFcn/pkix_pl_HttpDefaultClient_RequestCreate/pkix_HttpCertStore_FindSocketConnection/PKIX_PL_Sprintf/PKIX_PL_String_Create/PKIX_PL_Malloc/**
+ocspclnt/main/CERT_CheckOCSPStatus/ocsp_GetEncodedOCSPResponseFromRequest/pkix_pl_HttpDefaultClient_RequestCreateFcn/pkix_pl_HttpDefaultClient_RequestCreate/pkix_HttpCertStore_FindSocketConnection/PKIX_PL_Sprintf/PKIX_PL_String_Create/PKIX_PL_Object_Alloc/PKIX_PL_Malloc/**
+ocspclnt/main/CERT_CheckOCSPStatus/ocsp_GetEncodedOCSPResponseFromRequest/pkix_pl_HttpDefaultClient_RequestCreateFcn/pkix_pl_HttpDefaultClient_RequestCreate/pkix_HttpCertStore_FindSocketConnection/PKIX_PL_Sprintf/PKIX_PL_String_Create/PKIX_PL_Object_Alloc/PR_NewLock/**
+ocspclnt/main/CERT_CheckOCSPStatus/ocsp_GetEncodedOCSPResponseForSingleCert/ocsp_GetEncodedOCSPResponseFromRequest/fetchOcspHttpClientV1/pkix_pl_HttpDefaultClient_RequestCreateFcn/pkix_HttpCertStore_FindSocketConnection/PKIX_PL_HashTable_Add/pkix_pl_PrimHashTable_Add/PKIX_PL_Malloc
+ocspclnt/main/CERT_CheckOCSPStatus/ocsp_GetEncodedOCSPResponseForSingleCert/ocsp_GetEncodedOCSPResponseFromRequest/fetchOcspHttpClientV1/pkix_pl_HttpDefaultClient_RequestCreateFcn/pkix_HttpCertStore_FindSocketConnection/PKIX_PL_Sprintf/PKIX_PL_String_Create/PKIX_PL_Malloc
+ocspclnt/main/CERT_CheckOCSPStatus/ocsp_GetEncodedOCSPResponseForSingleCert/ocsp_GetEncodedOCSPResponseFromRequest/fetchOcspHttpClientV1/pkix_pl_HttpDefaultClient_RequestCreateFcn/pkix_HttpCertStore_FindSocketConnection/PKIX_PL_Sprintf/PKIX_PL_String_Create/PKIX_PL_Object_Alloc/PKIX_PL_Malloc
+ocspclnt/main/CERT_CheckOCSPStatus/ocsp_GetEncodedOCSPResponseForSingleCert/ocsp_GetEncodedOCSPResponseFromRequest/fetchOcspHttpClientV1/pkix_pl_HttpDefaultClient_RequestCreateFcn/pkix_HttpCertStore_FindSocketConnection/PKIX_PL_Sprintf/PKIX_PL_String_Create/pkix_EscASCII_to_UTF16/PKIX_PL_Malloc
+ocspclnt/main/CERT_CheckOCSPStatus/ocsp_GetEncodedOCSPResponseForSingleCert/ocsp_GetEncodedOCSPResponseFromRequest/fetchOcspHttpClientV1/pkix_pl_HttpDefaultClient_RequestCreateFcn/pkix_HttpCertStore_FindSocketConnection/pkix_pl_Socket_CreateByHostAndPort/PKIX_PL_Object_Alloc/PKIX_PL_Malloc
 
 #393181
 ocspclnt/main/CERT_SetOCSPDefaultResponder/PORT_Strdup/**
@@ -126,6 +152,7 @@ ocspclnt/main/CERT_SetOCSPDefaultResponder/ocsp_InitStatusChecking/PORT_ZAlloc/*
 ocspclnt/main/CERT_SetOCSPDefaultResponder/PORT_ZAlloc/**
 
 #393183
+ocspclnt/main/PL_CreateOptState
 ocspclnt/main/PL_CreateOptState/**
 
 #397478
@@ -137,6 +164,7 @@ selfserv/main/SSL_ConfigServerSessionIDCache/__nss_InitLock/PR_NewLock/calloc
 */main/*/*/SECMOD_LoadModule/SECMOD_CreateModule/secmod_NewModule/PORT_ArenaAlloc/PL_ArenaAllocate/LockArena/PR_CallOnce/InitializeArenas/PR_NewLock/**
 */main/*/*/SECMOD_LoadModule/SECMOD_CreateModule/secmod_NewModule/PORT_ArenaAlloc/PL_ArenaAllocate/PR_CallOnce/InitializeArenas/PR_NewLock/**
 */main/*/*/SECMOD_LoadModule/SECMOD_CreateModule/PORT_ArenaAlloc/PL_ArenaAllocate/LockArena/PR_CallOnce/InitializeArenas/PR_NewLock/**
+ocspclnt/main/NSS_Init/SECMOD_LoadModule/SECMOD_CreateModule/secmod_NewModule/PORT_ArenaAlloc/PL_ArenaAllocate/LockArena/PR_CallOnce/InitializeArenas/PR_NewLock/**
 
 #397486
 strsclnt/_pt_root/thread_wrapper/do_connects/handle_connection/PR_Send/ssl_Send/ssl_SecureSend/ssl_Do1stHandshake/ssl2_BeginClientHandshake/ssl_LookupSID/lock_cache/ssl_InitClientSessionCacheLock/__nss_InitLock/PR_NewLock/PR_Calloc/calloc
@@ -153,4 +181,5 @@ strsclnt/main/client_main/PR_GetAddrInfoByName/getaddrinfo/_getaddrinfo/get_addr
 ocspclnt/CERT_CheckOCSPStatus/ocsp_GetOCSPStatusFromNetwork/ocsp_GetEncodedOCSPResponseForSingleCert/ocsp_GetEncodedOCSPResponseFromRequest/fetchOcspHttpClientV1/pkix_pl_HttpDefaultClient_RequestCreateFcn/pkix_pl_HttpDefaultClient_RequestCreate/pkix_HttpCertStore_FindSocketConnection/pkix_pl_Socket_CreateByHostAndPort/PR_GetHostByName/gethostbyname_r/__rpc_getconfip/setnetconfig/**
 ocspclnt/ocsp_GetOCSPStatusFromNetwork/ocsp_GetEncodedOCSPResponseForSingleCert/ocsp_GetEncodedOCSPResponseFromRequest/fetchOcspHttpClientV1/pkix_pl_HttpDefaultClient_RequestCreateFcn/pkix_pl_HttpDefaultClient_RequestCreate/pkix_HttpCertStore_FindSocketConnection/pkix_pl_Socket_CreateByHostAndPort/PR_GetHostByName/gethostbyname_r/__rpc_getconfip/setnetconfig/**
 ocspclnt/main/CERT_CheckOCSPStatus/ocsp_GetOCSPStatusFromNetwork/ocsp_GetEncodedOCSPResponseFromRequest/pkix_pl_HttpDefaultClient_RequestCreateFcn/pkix_HttpCertStore_FindSocketConnection/pkix_pl_Socket_CreateByHostAndPort/PR_GetHostByName/gethostbyname_r/__rpc_getconfip/setnetconfig/**
+ocspclnt/main/CERT_CheckOCSPStatus/ocsp_GetEncodedOCSPResponseForSingleCert/ocsp_GetEncodedOCSPResponseFromRequest/fetchOcspHttpClientV1/pkix_pl_HttpDefaultClient_RequestCreateFcn/pkix_HttpCertStore_FindSocketConnection/pkix_pl_Socket_CreateByHostAndPort/PR_GetHostByName/gethostbyname_r/__rpc_getconfip/setnetconfig/**