Sonar 3.5.1

Closes #19295.

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