HIVE-8536: add spark-version classes and revert change to MR code
HIVE-8536: address RB comments