[SPARK-1812] [WIP] Scala 2.11 support

Still work in progress