Address pylint warnings / errors

A few commits ago we broke pylint. Even though we don't gate on it, it
is always nice to try and make it happy.

Change-Id: Ic91b41453e4c9dc0555ad7610a3047de69a53b46
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>