Reset spark driver port after stopping SparkContext.
Merge branch 'master' into branch-0.7