Fix nss-related problems with password-protected documents.

Apply patches from upstream commits r1724971 and r1726068 to fix
upstream bug https://bz.apache.org/ooo/show_bug.cgi?id=125431,
"The Password is incorrect. The file cannot be opened."

PR: 206234
Submitted by: Arrigo Marchiori <ardovm AT yahoo.it>
MFH: 2106Q1