Resolved 0.4.0 related conflicts: modules/users/server/controllers/users/users.authentication.server.controller.js