Change in osmo-pcu[master]: Make linter happy: fix coding style issues