Merged revisions 336093 via svnmerge from

Merged revisions 336093 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r336093 | irroot | 2011-09-15 17:46:21 +0200 (Thu, 15 Sep 2011) | 20 lines

  Locking order in app_queue.c causes deadlocks.

  a channel lock must never be held with the queues container lock held.

  the deadlock occured on masquerade.

  the queues container lock is a relic of the past the old queue module lock.
  with ao2 there is no need to hold this lock when dealing with members this
  patch removes unneeded locks.

  (closes issue ASTERISK-18101)
  (closes issue ASTERISK-18487)
  Reported by: Paul Rolfe, Jason Legault
  Tested by: irroot, Jason Legault, Paul Rolfe
  Reviewed by: Matthew Nicholson

  Review: https://reviewboard.asterisk.org/r/1402/
........

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