NSS 3.16.4 actually not vulnerable to the vulnerability it was marked vulnerable to.
Merge branch 'myhead_pending' into myhead