Merge branch 'issue/393' into 'master'

SCRUM#393: Removes configuration files that change the system in an undesirable way and makes minor modifications to the code to avoid undesired operation

See merge request !15
4 jobs for master in 2 minutes and 11 seconds (queued for 6 seconds)
Status Name Job ID Coverage
  Build
passed build #22388
debian-packaging

00:00:23

 
  Test
passed test #22389
ubuntu regular

00:01:29

 
  Deploy
manual deploy_for_stable #22391
debian-packaging allowed to fail manual
passed deploy_for_testing #22390
debian-packaging

00:00:18