Cleanup more

use alternate variable names to make things clearer

fix hadoop shutdown time calculation correct when hbase enabled
Fix comment error
Use variables appropriately
Add Spark support into Magpie