fixup and merge in FS-4027 enhancements for additional device support
FS-5555 improvement --resolve
FS-4027 - improve adherence to code conventions
Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch