Merge "Override thermal status in jobscheduler related tests"