sonar 4.1

Closes #26048.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
jenkins 1.547

Closes #26050.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>