Merge branch 'master' into scheduler-agent-repr

Conflicts:
	harpoon-scheduler/xf/xf.go