Merge branch 'mos-shuffle-parallel' into mos-shuffle-tracked

conf/java-opts

src/scala/spark/CustomBlockedInMemoryShuffle.scala

src/scala/spark/CustomBlockedLocalFileShuffle.scala

src/scala/spark/CustomParallelInMemoryShuffle.scala

src/scala/spark/CustomParallelLocalFileShuffle.scala

src/scala/spark/HttpBlockedLocalFileShuffle.scala

src/scala/spark/HttpParallelLocalFileShuffle.scala

src/scala/spark/ManualBlockedLocalFileShuffle.scala

src/scala/spark/TrackedCustomParallelLocalFileShuffle.scala