CONN-892, CONN-909: Logging Issues identified by Fortify are fixed.