Minor tweaks to channels model after refactor of persistence layer
Merge branch 'mbst-4019-ingest-pa-channel-data' into stage