FS-5741 --resolve
Merge branch 'v1.2.stable' of git://git.freeswitch.org/freeswitch into v1.2.stable