Merge "M/N upgrade set scheduler_host_manager right."