align zones to gazebo zones

2 jobs for master in 6 minutes and 52 seconds (queued for 2 seconds)