NO-JIRA: Add extra debug logging and add asserts to verify broker store persistence
4 files changed