Merge "Revert^2 "Restore pre-bc update pkcs12 null password behavior"" into main