Bug 1040113: Handling edge cases in cleaning up downloaded cart map
Also, fixing a couple of minor issues
Merge pull request #4531 from abhgupta/abhgupta-dev

Merged by openshift-bot
Fix test cases