[MRQL-95] Add support for Spark 2.0
8 files changed