Bug 967153: Update to NSS 3.16 beta 2 (NSS_3_16_BETA2), r=me, a=sledru

--HG--
extra : rebase_source : 8a947a272f340bc5739ec5101f68d43d3e0f9650
Bug 896620: Make marketplace certs work on in all products, r=keeler, r=briansmith, a=sledru

--HG--
extra : rebase_source : 44a50d32d469bda6a4947a91838e76e4650994d0
extra : histedit_source : 8cbea7de63a2308e48165c0c1b69ba4344a0981d