CONN-610: fixes for EventLogging-Standard.
Merge pull request #586 from msweaver/CONN-610

CONN-610: fixes for EventLogging-Standard.