Revert "Revert "Revert "Merge branch 'groovy_unstable' of https://github.com/uscauv/uscauv-ros-pkg into groovy_unstable"""

This reverts commit 06d36489e26d2ae5a4e87639dabb463a64f14c7f.

"Reverting revert"