FS-5532 - workaround to improve behavior, but not correct fix
fix return values from refactor so stun timeouts can trigger error properly
fix trivial compiler warning
mod_rayo: Punchblock now supports content-type on input matches

Fix applied to Punchblock here: https://github.com/adhearsion/punchblock/commit/cef5198e80b60e19fc949b21f6e0dc438cecc5df
misc constant name adjustments to match actual text on phones
Merge branch 'master' of git://git.freeswitch.org/freeswitch