Added back get_upload_id().
Merge pull request #1450 from reinhillmann/manifestchanges

Added back get_upload_id().
Removed some debug code.
reverted test_key.py back, didn't mean to commit some debug stuff
Merge branch 'develop' into localencryption