o.c.dct: first attempt to fix DCT-36
Merge branch 'cleanup' of github.com:Desy-extern/cs-studio into cleanup
o.c.dct: fix for DCT-15