Merge remote-tracking branch 'apache-spark/master' into SPARK-3666

Conflicts:
	graphx/src/main/scala/org/apache/spark/graphx/VertexRDD.scala