Fix minor bugs in api client helper
Merge branch 'master' into 1-go-metrics

Conflicts:
	client/helper.go