Fix spark-shell in branch-1.0