Fix import_catkin_packages.py

Fix Groovy/Hydro packages, use rosdep for non-ROS dependencies...