fix merge conflicts; need to widen visibility in a few cases

Author: squito

core/src/main/scala/org/apache/spark/deploy/history/ApplicationHistoryProvider.scala

@@ -19,7 +19,7 @@ package org.apache.spark.deploy.history
 
 import org.apache.spark.ui.SparkUI
 
-private[history] case class ApplicationHistoryInfo(
+private[spark] case class ApplicationHistoryInfo(
     id: String,
     name: String,
     startTime: Long,

core/src/main/scala/org/apache/spark/deploy/master/ApplicationInfo.scala

@@ -28,7 +28,7 @@ import org.apache.spark.annotation.DeveloperApi
 import org.apache.spark.deploy.ApplicationDescription
 import org.apache.spark.util.Utils
 
-private[deploy] class ApplicationInfo(
+private[spark] class ApplicationInfo(
     val startTime: Long,
     val id: String,
     val desc: ApplicationDescription,

core/src/main/scala/org/apache/spark/deploy/master/Master.scala

@@ -735,7 +735,7 @@ private[master] class Master(
    * Rebuild a new SparkUI from the given application's event logs.
    * Return the UI if successful, else None
    */
-  private def rebuildSparkUI(app: ApplicationInfo): Option[SparkUI] = {
+  private[master] def rebuildSparkUI(app: ApplicationInfo): Option[SparkUI] = {
     val appName = app.desc.name
     val notFoundBasePath = HistoryServer.UI_PATH_PREFIX + "/not-found"
     try {