Fixes for moveit_simple_grasps change