fixing long line issues
Merge pull request #627 from jovanchohan/pylint_fixes

fixing long line issues
Merge remote-tracking branch 'org/testing' into no-nameservers-in-etc-resolv
fixed broken unit test