CONN-673: Logging Issues identified by Fortify are fixed.