Wait for mongo to startup before adding collections.
Merge remote-tracking branch 'origin/master' into mdediting