Fixup tests for recent certutil changes
    
    * Skip certutil's
    certutil: Checking token "NSS Certificate DB" in slot "NSS User Private Key and Certificate Services"
      message, which is printed at a different point(?) now.
    * If a certutil error message includes an error name, strip out the
      name, because it didn't always used to be there.