Merge changes from topic "revert-1299358-remove_bc_algos-UNYPUMEPBO"

* changes:
  Revert "Remove deprecated BouncyCastle algorithms"
  Revert "Load default KeyFactory instead of BC's implementation"