Fix pylint errors in 2014.1 branch
Merge pull request #18965 from rallytime/fix_pylint

Fix pylint errors in 2014.1 branch