fixing some pylint issues.
Merge pull request #11299 from garethgreenaway/develop

fixing some pylint issues.