Merge remote-tracking branch 'origin/master' into windows-fixes

package.json

@@ -6,13 +6,13 @@
   "scripts": {
     "build-backend": "cd build && bk-build.sh",
     "full-build-dev": "npm run build-dev; npm run build-backend",
-    "fetch-backend-deps": "cd build && bk-fetch-deps.sh",
-    "test-backend": "cd build && bk-build.sh test",
+    "fetch-backend-deps": "./build/bk-fetch-deps.sh",
+    "test-backend": "./build/bk-build.sh test",
     "update-webdriver": "webdriver-manager update",
     "build": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng build --prod",
     "build-cf": "node --max_old_space_size=1500 --gc_interval=100 node_modules/@angular/cli/bin/ng build --prod",
     "build-dev": "ng build --dev",
-    "prebuild-ui": "npm run build && gulp package-prebuild",
+    "prebuild-ui": "npm run build && npm run prebuild-zip",
     "prebuild-zip": "node build/prebuild-zip.js",
     "ng": "ng",
     "start": "ng serve",
@@ -134,7 +134,7 @@
     "karma-jasmine-html-reporter": "^1.5.3",
     "karma-spec-reporter": "0.0.32",
     "kind-of": "^6.0.3",
-    "lodash": "^4.17.13",
+    "lodash": "^4.17.19",
     "mem": "6.1.0",
     "mktemp": "^1.0.0",
     "ng-packagr": "^9.1.1",