Updates to cancellation logic during download and indexing of packfile.
Merge pull request #1981 from jamill/download_cancel_tweaks

Updates to cancellation logic during download and indexing of packfile.