sonar 4.1.1

Closes #26280.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>