Merge branch 'renovate-org.apache.logging.log4j-log4j-slf4j-impl-2.x' of https://git.griefed.de/prosper/docker-template-repo

# Conflicts:
#	build.gradle