convStep and GroupedCkfTrajectoryBuilderESProducerP5 back to default, TrajectorySegmentBuilder besthitonly fix updated