Fixups to match reality
Sync up to current version of mozilla-nss.

Incorporate on the mozilla-nss version so that we ensure a matching set
to what is in libnssckbi.so

Bump the meaningless version to a slightly less meaningless one that
hereafter doesn't need to change.