Modify diff for feature-scheduler branch of trillek-client-core