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

Updated logging based on the Fortify results..