[nss/f20] (8 commits) ...Merge branch 'master' into f20

[Elio Maldonado]

Summary of changes:

  5d65d32... ARM tests pass so remove ARM conditional (*)
  a25fc11... Update pem sources to latest from nss-pem upstream (*)
  4fb9d07... Add explanatory comments for iquote.patch as was done on f2 (*)
  4c076bc... Revert previous change that moved some sysinit manpages (*)
  9b8380a... Update to nss-3.15.5 (*)
  23d7297... Temporarily requiring only nss_softokn_version >= 3.15.4 (*)
  4f24d9e... Remove reference to a patch that we aren't yet ready to app (*)
  445b786... Merge branch 'master' into f20

(*) This commit already existed in another branch; no separate mail sent