[SPARK-1812] [WIP] Scala 2.11 support

Still work in progress
Why would removing this be related to Scala 2.11? These are important