Update entries for sdformat and gazebo
Merge with upstream:master
Merge pull request #2923 from j-rivero/master

Update entries for sdformat and gazebo