MFH: r405096 (direct commit to openoffice-4 only)
MFH: r406872 (direct commit to openoffice-4 only)
MFH: r407439

r405096:
Correct the Icon entry in the .desktop files so that the icons are
visible in the menu.

r406872:
PORTREVISION bump to allow a clean merge of the next

r470439: [1]
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: 205758
PR: 206234
Submitted by: Arrigo Marchiori <ardovm AT yahoo.it> [1]
Approved by: ports-secteam (miwi - r407439)
Approved by: ports-secteam (feld - r405096, r406872)