Re #10137. Fixing indentation issues.
Re #10137. Fixing unit test error.
Merge remote branch 'origin/feature/10137_pylint_whitespace'