Add missing import.
Pylint fixes.
Merge pull request #8689 from s0undt3ch/0.17

0.17 - Lint Fixes