Merge topic 'source-static-analysis-cleanups'

526c34c0b0 Source: Minor static-analysis cleanups

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !12150