Merge "Move per-role *SchedulerHints parameters into role templates"