Merge pull request #2690 from apache/fix-create-db-options

Fix create db options on secondary shard creation