o.c.c.ioconfig: fix for IOC-50 - first try to fix IOC-54
Merge branch 'rel15x_beta' of https://github.com/Desy-extern/cs-studio into rel15x_beta