Merge pull request #1424 from jbertram/master

fix logging IDs and formatting
Document SSL options