Merge remote-tracking branch 'origin/master'

# Conflicts:
#	httpdocs/plp-angular/package-lock.json
#	httpdocs/plp-angular/package.json

httpdocs/plp-angular/package.json

@@ -36,8 +36,8 @@
   },
   "devDependencies": {
     "@angular/cli": "^9.1.15",
-    "@angular/compiler-cli": "^10.2.5",
-    "@angular/language-service": "^10.2.5",
+    "@angular/compiler-cli": "^9.1.13",
+    "@angular/language-service": "^9.1.13",
     "@types/file-saver": "^2.0.1",
     "@types/jasmine": "~3.3.8",
     "@types/jasminewd2": "^2.0.8",
@@ -53,6 +53,6 @@
     "protractor": "~5.4.0",
     "ts-node": "~7.0.0",
     "tslint": "~5.15.0",
-    "typescript": "~4.0.8"
+    "typescript": "~3.8.3"
   }
 }