Merge remote-tracking branch 'origin/develop' into irc-to-js

packages/rocketchat-importer/client/admin/adminImport.coffee

packages/rocketchat-importer/client/admin/adminImport.js

...ocketchat-importer/client/admin/adminImportPrepare.coffee

...es/rocketchat-importer/client/admin/adminImportPrepare.js

...cketchat-importer/client/admin/adminImportProgress.coffee

...s/rocketchat-importer/client/admin/adminImportProgress.js

packages/rocketchat-importer/lib/_importer.coffee

packages/rocketchat-importer/lib/_importer.js

packages/rocketchat-importer/lib/importTool.coffee

packages/rocketchat-importer/lib/importTool.js

packages/rocketchat-importer/package.js

...es/rocketchat-importer/server/classes/ImporterBase.coffee

packages/rocketchat-importer/server/classes/ImporterBase.js

...ocketchat-importer/server/classes/ImporterProgress.coffee

...es/rocketchat-importer/server/classes/ImporterProgress.js

...tchat-importer/server/classes/ImporterProgressStep.coffee

...ocketchat-importer/server/classes/ImporterProgressStep.js

...cketchat-importer/server/classes/ImporterSelection.coffee

...s/rocketchat-importer/server/classes/ImporterSelection.js

...t-importer/server/classes/ImporterSelectionChannel.coffee