Merge remote-tracking branch 'upstream/master'

Author: mtrezza

package-lock.json

@@ -42,7 +42,7 @@
     "intersect": "1.0.1",
     "jsonwebtoken": "8.5.1",
     "jwks-rsa": "1.11.0",
-    "ldapjs": "2.2.0",
+    "ldapjs": "2.2.1",
     "lodash": "4.17.20",
     "lru-cache": "5.1.1",
     "mime": "2.4.6",