[SPARK-1812] [WIP] Scala 2.11 support

Still work in progress
Same, you can't change this for the default of Hadoop 1