FREEPBX-8204 chan_pjsip: trunk definition not deleted?
FREEPBX-8191 Call Pickup groups not written to config
Merge branch 'feature/recording-changes' into release/12.1