Merge branch 'kinetic_migration' of ssh://gitlab.iri.upc.edu:2202/labrobotica/ros/iri_core/iri_base_driver into kinetic_migration