Fixed more pylint problems discovered by the new pylint -p.

Leo build: 20141110102649