backporting latest module
Merge pull request #1704 from edx/e0d/pullin-mongo-user

backporting latest module