fix some bugs and remove the data download/unzip for upgrade job
Merge pull request #99 from michaelnsj/cluster

Merged.