Merge branch 'master' into track-host-resources

Conflicts:
	_integration/agent-test-basic/basic_test.go
	harpoon-agent/api_test.go