Revise openssl packaging (merged package)