Merge remote-tracking branch 'upstream/master' into upload-token

akka-bbb-apps/.dockerignore

akka-bbb-apps/Dockerfile

akka-bbb-apps/src/main/resources/application.conf

...rc/main/scala/org/bigbluebutton/SystemConfiguration.scala

...n/scala/org/bigbluebutton/core/apps/WhiteboardModel.scala

akka-bbb-fsesl/Dockerfile

akka-bbb-fsesl/wait-for-it.sh

bbb-common-message/Dockerfile

bbb-common-web/Dockerfile

...bluebutton/presentation/DocumentConversionServiceImp.java

...ain/java/org/bigbluebutton/presentation/ImageResizer.java

...va/org/bigbluebutton/presentation/SupportedFileTypes.java

...bluebutton/presentation/handlers/ImageResizerHandler.java

...a/org/bigbluebutton/presentation/imp/ImageResizerImp.java

...n/presentation/imp/ImageToSwfSlidesGenerationService.java

...ton/presentation/imp/PdfToSwfSlidesGenerationService.java

bbb-fsesl-client/Dockerfile

bbb-lti/.dockerignore

bbb-lti/Dockerfile

bbb-lti/docker-entrypoint.sh