Bug 898431 - Update NSS to NSS 3.15.4 (NSS_3_15_4_RTM). a=Preeti
Bug 934171 - Fix OCSP stapling test. r=mcmanus, a=test-only
Bug 930209 - Differentiate empty OCSP response from no OCSP response in tests. r=cviecco, a=test-only
Bug 934327 - Give OCSP-related NSS errors symbolic names in xpcshell tests. r=keeler, a=test-only
Bug 932519 - (1/3) Move common OCSP response generation test code for refactoring. r=cviecco, r=briansmith, a=test-only

--HG--
rename : security/manager/ssl/tests/unit/tlsserver/cmd/OCSPStaplingServer.cpp => security/manager/ssl/tests/unit/tlsserver/lib/OCSPCommon.cpp
rename : security/manager/ssl/tests/unit/tlsserver/cmd/OCSPStaplingServer.cpp => security/manager/ssl/tests/unit/tlsserver/lib/OCSPCommon.h
Bug 932519 - (2/3) Rename OCSP response generation test code to remove "stapling". r=cviecco, r=briansmith, a=test-only
Bug 932519 - (3/3) Add an optional additional cert name as a parameter to GetOCSPResponseForType. r=cviecco, r=briansmith, a=test-only
Bug 938805 - Create standalone oscpResponseGenerator for testing. r=keeler, a=test-only
Bug 942164 - Store weak references to imgRequest consumers. r=seth, a=1.2.x+
Bug 942164 - Fix merge error. a=bustage
Bug 942164 - Fix merge error #2. a=bustage