Fixing topo.CreateShard to be more resilient.

It now handles the case when DeleteKeyspaceShards was
called before a new CreateShard.
Merge commit '68f68cc8195614c24d87220b144e30381e623f37'