Change pkcs12 so the certificates coming from -in do not get tossed if -certfile is given as well.
Change pkcs12 so the certificates coming from -in do not get tossed if
-certfile is given as well.

openssl/openssl,openssl/openssl,openssl/openssl,openssl/openssl,openssl/openssl,openssl/openssl