LPS-31817

LPS-31817 Unable to complete an upgrade to 6.1 using sharding because it tries to upgrade the default shard twice