FREEPBX-8204 chan_pjsip: trunk definition not deleted?
Merge branch 'release/12.0' into release/13.0