sched: Late fixes for 10.1

JIRA: https://issues.redhat.com/browse/RHEL-92921

Several fixes from upstream need to be included in
10.1 to prevent hitting issues in the field.

Signed-off-by: Phil Auld pauld@redhat.com