merge in trunk to help with the pkcs12 type unit tests a bit