Fixes for pylint under jenkins
Merge pull request #965 from timlinux/develop

Fixes for pylint under jenkins