[BACKPORT] Pylint fixes