reset commit to 2f9b2bd7844ee8393dc9c319f4fefedf95f5e460 and 37b10086bf55560c087062f62f942b1102435a95 from https://github.com/apache/spark/tree/branch-1.1 for 1.1-rc4 release