Merge branch 'tmp' into '563-spring-security'

Reverting service changes

See merge request !579
17 jobs for 563-spring-security in 2 minutes and 45 seconds (queued for 3 seconds)