Fix to build with hadoop1, this includes changes to pull SparkHadooputil out of SparkEnv