Bug 820887: Fix early return in HandshakeCallback, r=keeler

--HG--
extra : rebase_source : e60d86d2b796bda0d44fe640663261cbebede495
Bug 531067: Remove hard-coded default OCSP responders on trunk, r=briansmith

--HG--
extra : rebase_source : 23bc45569bba9f417a51c13530f0319144f07b03
Bug 837862: Remove the MOZ_PSM build option, r=gps

--HG--
extra : rebase_source : 61403d908f5507d2b5b69894efc28a8a2e2abbd0
Bug 832768, bug 864682, bug 707777 - Disable flaky media tests until they aren't anymore.