Refinements to "rosdep" fix

Refinements to "rosdep" fix.