Merge "logging: Replace deprecated use of CommentStore::getStore()"