Update CAFMaker to fill new trigger variables#583

kjplows merged 3 commits intodevelopSBNSoftware/sbncode:developfrom

feature/TriggerWorkNikkiCAFsSBNSoftware/sbncode:feature/TriggerWorkNikkiCAFsCopy head branch name to clipboard