Fix generic CSI changeID retrieval and honor snapshot class deletion policy for CBT retention
