[OPENENGSB-3776] better support for xlink switch
Merge pull request #916 from stfnsche/xlink

[OPENENGSB-3776] better support for xlink switch