Ensure temporary download files are always deleted
Merge branch 'b2.5'
Fixed accept-key test to require user input

The Python test was intended to test this, but didn't because it used
the key info server instead.
Migrated TestDownload.testImport to OCaml