SPARK-2791: Fix committing, reverting and state tracking in shuffle file consolidation#1678

aarondav wants to merge 3 commits intoapache:masterapache/spark:masterfrom

aarondav:consolaarondav/spark:consolCopy head branch name to clipboard