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

--HG--
extra : source : e7b156a508d35034735e0cb44e5f73d6e8b76cc7
Bug 896620: Make marketplace certs work on in all products, r=keeler

--HG--
extra : source : 86ec7137a8892f75918c77e605df970f5b96ef62
extra : histedit_source : 33326790804d49e6ec658626116ebf870d94d445