Merge "Add pfx extension as "application/x-pkcs12""