various minor pylint fixes
Merge pull request #5303 from hulu/pylint-fixes

various minor pylint fixes