Merge new things into usertomcat branch

Merged Stefan Funk requested to merge master into 2-move-usertomcat-webapps-into-containers

Merge request reports