changes matching updates to moveit_core