Merge "BaseBlockCipher: do not use PKCS12 for BCPBEKeys without IV"