MAHOUT-1615: remove temporary hard coded settings from spark-shell
Merge branch 'master' into rf-core