Changing other places to not lock shards.

When we do a rebuild, no need to lock a shard if UseSrvShardLocks
is on.