Propagating shard name from Shard to SrvShard.

So the users of SrvShard don't have to compute it.
Merge branch 'master' of github.com:youtube/vitess