Merged revisions 294084 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r294084 | bbryant | 2010-11-05 18:03:11 -0400 (Fri, 05 Nov 2010) | 9 lines
  
  Fixed deadlock avoidance issues while locking channel when adding the
  Max-Forwards header to a request.
  
  (closes issue #17949)
  (closes issue #18200)
  Reported by: bwg
  
  Review: https://reviewboard.asterisk.org/r/997/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@294086 65c4cc65-6c06-0410-ace0-fbb531ad65f3