Fixes some automerge conflicts in velocity_positios_controller branch

Recently indigo-devel was pulled into this branch and there were some auto-merge conflicts. I addressed the conflicts.

Make sure I removed the correct duplicate class from hardware_interface_adapter.h