Bug 834741, landing NSPR_4_9_5_BETA2 and NSS_3_14_2_BETA3, r=wtc, a=lsblakk