Sonar 3.6

Closes #20833.

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

Closes #20834.

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