Batch whitespace fixes & ocp-indent run

CI is all blue.