Merge citools
Merge branch 'merging-citools' of https://github.com/Emenda/klocwork-plugin into merging-citools