merged the gazebo changes from hydro to groovy

No time for a code review as I need it this morning. Can someone do a post-merge code review in case I missed something?