Minor cleanup: whitespace and comment.
Merge branch 'develop' into lsm-logging-fixes