umgmt -> proc
umgmt -> proc
umgmt -> proc
Merge branch 'master' into sougou-work

Conflicts:
	go/cmd/vt_binlog_player/vt_binlog_player.go
umgmt -> proc
Merge branch 'master' into resharding

Conflicts:
	go/cmd/vt_binlog_player/vt_binlog_player.go
	go/vt/vttablet/agent.go