Try to fix last 4 pylint errors under jenkins
Merge pull request #968 from timlinux/develop

Try to fix last 4 pylint errors under jenkins