Merge branch 'develop' into develop-sync

packages/rocketchat-api/package.js

packages/rocketchat-api/server/helpers/getUserInfo.js

packages/rocketchat-api/server/v1/roles.js

packages/rocketchat-api/server/v1/users.js

packages/rocketchat-lib/client/MessageAction.js

packages/rocketchat-livechat/.app/package-lock.json

packages/rocketchat-livechat/server/lib/Livechat.js

...ges/rocketchat-livechat/server/methods/returnAsInquiry.js

packages/rocketchat-livechat/server/methods/takeInquiry.js

...ages/rocketchat-livechat/server/models/LivechatInquiry.js

packages/rocketchat-markdown/markdown.js

packages/rocketchat-mentions/Mentions.js

packages/rocketchat-ui/client/lib/RoomHistoryManager.js

packages/rocketchat-ui/client/views/app/room.html

tests/end-to-end/api/01-users.js

tests/end-to-end/api/13-roles.js