add tests for restarts, and fix listen order in vttablet
Merge branch 'master' into sougou-work

Conflicts:
	go/cmd/vttablet/vttablet.go
post-mrege fixes
Merge branch 'master' into sougou-work