Merge remote-tracking branch 'origin/feature/SPARK-2458-2' into feature/SPARK-2458-2

Conflicts:
	core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala