Fixed merge conflicts.

bin/compute-classpath.sh

.../scala/org/apache/spark/util/collection/OpenHashSet.scala

graph/src/main/scala/org/apache/spark/graph/Analytics.scala

graph/src/main/scala/org/apache/spark/graph/Graph.scala

...n/scala/org/apache/spark/graph/GraphKryoRegistrator.scala

graph/src/main/scala/org/apache/spark/graph/GraphOps.scala

graph/src/main/scala/org/apache/spark/graph/Pregel.scala

.../src/main/scala/org/apache/spark/graph/VertexSetRDD.scala

...ain/scala/org/apache/spark/graph/impl/EdgePartition.scala

...rc/main/scala/org/apache/spark/graph/impl/GraphImpl.scala

...cala/org/apache/spark/graph/impl/MessageToPartition.scala

.../main/scala/org/apache/spark/graph/impl/Serializers.scala

graph/src/main/scala/org/apache/spark/graph/package.scala

...rc/test/scala/org/apache/spark/graph/AnalyticsSuite.scala

graph/src/test/scala/org/apache/spark/graph/GraphSuite.scala

...c/test/scala/org/apache/spark/graph/SerializerSuite.scala

graphx-shell

repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala