Fixed regression in reservations.

When we assign roles for reserved task resources, we must use roles that
were actually offered those resources.

This was introduced by 9bc10a334.

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