Sonar 3.4.1

Closes #16953.

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