Re #10137. Fixing broken unit tests.
Merge branch 'feature/10137_pylint_whitespace' into develop