Merge pull request #581 from caskdata/feature/fix-develop

Spark Integration: Inc spark program timeout in test
Spark Integration: Close spark context in unit test