Merge pull request #902 from stfnsche/master

[OPENENGSB-3778] fix checkstyle errors in itests