Fixed #21268 -- Fixed E303 pep8 warnings
Merge pull request #1768 from alasdairnicol/ticket_21268

Fixed #21268 -- Fixed E303 pep8 warnings
Fixed #21287 -- Fixed E123 pep8 warnings