Re #10137. Fixing unit tests.
Re #10137. Fixing unit test.
Re #10137. Going back to version from master to fix unit test.

Created #10145 to address it.
Merge branch 'feature/10137_pylint_whitespace' into develop