adding the ability to specify roles when adding/modifying a mongo user
fixing merge conflict