Merge branch 'v2.1-dev' into 'v2.x-master'

Cleanup based on gradle:6-jdk11 image

See merge request !13
3 jobs for v2.x-master in 5 minutes and 11 seconds (queued for 30 seconds)