Merged latest from master

Dockerfile

@@ -2,8 +2,6 @@ FROM adoptopenjdk/openjdk11-openj9:alpine
 
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
 
-RUN apk -U --no-cache upgrade
-
 RUN apk add --no-cache -U \
   openssl \
   imagemagick \
@@ -68,6 +66,8 @@ COPY server.properties /tmp/server.properties
 COPY log4j2.xml /tmp/log4j2.xml
 WORKDIR /data
 
+STOPSIGNAL SIGTERM
+
 ENV UID=1000 GID=1000 \
   MEMORY="1G" \
   TYPE=VANILLA VERSION=LATEST \