Merge branch 'maven-dependency-clean' into 'master'

Maven dependency conflicts are resolved

See merge request !414
17 jobs for 53-allow-admins-to-configure-parameters-displayed-in-the-left-panel-2 in 9 minutes and 4 seconds (queued for 2 minutes and 57 seconds)