Merge branch 'kdl_minor_changes' into kinematic_base_non_chains
Merge branch 'robot_inter_update_markers' into kinematic_base_non_chains