Sonar 3.5

Closes #18476.

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