[Fixed] Waypoints on Mos Espa racetrack Mantis #4557

Change-Id: I1ae47f31f82f592df692cf3c189edc1ba91562ee
[Fixed] Invalid Mob Placement Mantis #4553

Change-Id: I4a56834b67cb2d46ff95dd0c2589e2357e5156a6
Merge "[Fixed] Waypoints on Mos Espa racetrack Mantis #4557" into unstable
Merge "[Fixed] Invalid Mob Placement Mantis #4553" into unstable