Fix merge error between PR #1130 and #1107

commit 8e30672
Merge: 6f1aff3 3ec8f59
Author: Peter Kolloch <peter@mesosphere.com>
Date:   Fri Mar 27 16:07:26 2015 +0100

    Merge pull request #1107 from mesosphere/wip-1106-drexin

    fixes #1106 - Return empty HealthCheck result instead of None, when no r...

src/main/scala/mesosphere/marathon/api/v2/AppTasksResource.scala

@@ -35,7 +35,7 @@ class AppTasksResource @Inject() (service: MarathonSchedulerService,
       id <- appIds
       health = result(healthCheckManager.statuses(id))
       task <- taskTracker.get(id)
-    } yield EnrichedTask(id, task, health.getOrElse(task.getId, Nil).map(Some(_)))
+    } yield EnrichedTask(id, task, health.getOrElse(task.getId, Nil))
 
     val matchingApps = appId match {
       case GroupTasks(gid) =>

src/main/scala/mesosphere/marathon/api/v2/TasksResource.scala

@@ -57,7 +57,7 @@ class TasksResource @Inject() (
       EnrichedTask(
         appId,
         task,
-        health.getOrElse(task.getId, Nil).map(Some(_)),
+        health.getOrElse(task.getId, Nil),
         appToPorts.getOrElse(appId, Nil)
       )
     }