Bug 967153: Update to NSS 3.16 beta 5 (NSS_3_16_BETA5), r=me

--HG--
extra : rebase_source : 8dfdcd121214b084acc01025a2cd989ccf6a603c
Bug 947584: Use official IANA names for cipher suites in PSM, r=cviecco

--HG--
extra : rebase_source : fafec912dc96480cb4f00bddec00d40e5e9db088