o.c.c.ioconfig: minor refactorings and dead code removal
o.c.c.ioconfig: removed merge conflict
Merge branch 'rel15x_beta' of https://github.com/Desy-extern/cs-studio into rel15x_beta
o.c.dct: minor enhancements and refactorings
o.c.dct.ui: resolving merge conflicts