Consolidated fixes
Merge branch 'consolidated_shuffle_fixes' of github.com:mridulm/spark into consolidated_shuffle_fixes
Disable code to detect programming shutdown via stop's. Make actor/store shutdown in DiskBlockManagerSuite more robust