Modified handling of mongodb port
Merge pull request #394 from nhr/originator_mongo_tweaks

Modified handling of mongodb port