Continuing to update Gentoo rosdeps.
Oops...
Merge pull request #1550 from allenh1/master

Continuing to update Gentoo rosdeps.