Fixed test regression.

Conflicts:
	src/main/scala/com/airbnb/scheduler/mesos/MesosJobFramework.scala