Make replica set configuration more robust
Merge pull request #460 from detiber/mongoRS21

Make replica set configuration more robust