Merge commit '804e13b59b36273b926d3a3acadd4486c6fb3a0b' into merge/6.2.2

# Conflicts:
#	package-lock.json
#	package.json

CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.2.2 - 2023-08-22
+
+-   Fix changelog versions
+
+## 6.2.1 - 2023-08-21
+
+-   Update Docker base image to Node 16 (#578)
+-   Fix: multiple "static" itemset datalists in the same repeat (enketo/enketo-core#995)
+-   Fix: global initialization of widgets where repeat count is zero (enketo/enketo-core#994)
+-   Use map instead of object for cached conversion of XPath expression
+    (enketo/enketo-core#985)
+-   Fix: include widgets with 'form' selector (enketo/enketo-core#993)
+-   Fix: don't display "ghost option" for itemsets with Likert appearance (enketo/enketo-core#992)
+-   Temporarily roll back buggy optimizations of enabling/disabling widget instances (enketo/enketo-core#990)
+-   Fix import error for enketo-transformer/web (enketo/enketo-transformer#184)
+
 ## 6.2.0 - 2023-07-03
 
 -   Make pdf generation timeout configurable (#560)

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14
+FROM node:16
 
 ENV ENKETO_SRC_DIR=/srv/src/enketo_express
 WORKDIR ${ENKETO_SRC_DIR}
@@ -7,7 +7,7 @@ RUN npm install -g pm2@$(npm info pm2 version)
 
 COPY . ${ENKETO_SRC_DIR}
 
-RUN npm clean-install && npx grunt && npm prune --production
+RUN npm install -g npm@^6 && npm clean-install && npx grunt && npm prune --production
 
 # Persist the `secrets` directory so the encryption key remains consistent.
 RUN mkdir -p ${ENKETO_SRC_DIR}/setup/docker/secrets