Merge branch 'master' into release/slackbot-proxy/current

package.json

@@ -22,7 +22,7 @@
   "private": true,
   "workspaces": {
     "packages": ["packages/*"],
-    "nohoist": ["**/bootstrap"]
+    "nohoist": ["slackbot-proxy/bootstrap"]
   },
   "scripts": {
     "build:api:jsdoc": "swagger-jsdoc -o tmp/swagger.json -d config/swagger-definition.js",