FS-5788 --resolve used wrong variable for setting custom origination SIP headers
Merge branch 'v1.2.stable' of git://git.freeswitch.org/freeswitch into v1.2.stable