Merge branch 'origin/master' into 14280-query-language

# Conflicts:
#	package.json

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>

diff --combined package.json
index 90fca4f28f0824a1eb0937f87c4de7a2b44438e3,64a24dcafcef48a5e245f487d214371c209bd636..1c066db8c1776fcf3238bf0a8e06190851b9e224
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -12,7 -12,7 +12,7 @@@
      "@types/react-dnd": "3.0.2",
      "@types/react-dropzone": "4.2.2",
      "@types/react-highlight-words": "0.12.0",
 -    "@types/redux-form": "7.4.5",
 +    "@types/redux-form": "7.4.12",
      "@types/reselect": "2.2.0",
      "@types/shell-quote": "1.6.0",
      "axios": "0.18.0",
@@@ -47,8 -47,9 +47,9 @@@
    "scripts": {
      "start": "react-scripts-ts start",
      "build": "REACT_APP_BUILD_NUMBER=$BUILD_NUMBER REACT_APP_GIT_COMMIT=$GIT_COMMIT react-scripts-ts build",
+     "build-local": "react-scripts-ts build",
      "test": "CI=true react-scripts-ts test --env=jsdom",
-     "test:watch": "react-scripts-ts test --env=jsdom",
+     "test-local": "react-scripts-ts test --env=jsdom",
      "eject": "react-scripts-ts eject",
      "lint": "tslint src/** -t verbose",
      "build-css": "node-sass-chokidar src/ -o src/",