COMP: workaround clang -Windent warnings by fixing indentation

No behaviour change, only whitespace changes.

Change-Id: I6090364bdfc71c6e0714832568f6b9b764aefbf6
Merge topic 'Windent'

aed62a59 COMP: workaround clang -Windent warnings by fixing indentation