Merge branch 'sched/core' into timers/nohz, to avoid conflicts in upcoming patches