various pylint warning fixes
Merge pull request #5904 from hulu/pylint-fixes

various pylint warning fixes