Fix pylint errors in 2014.1 branch