Merged revisions 321337 via svnmerge from

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

Also revert -r321331 and -r321332.

........
  r321337 | rmudgett | 2011-05-27 17:06:43 -0500 (Fri, 27 May 2011) | 7 lines

  The app_privacy args have undocumented "options" position, interferes with "context" position.

  * Add documention for unused "options" position to match existing code.

  (closes issue #19273)
  Reported by: mdavenport
........

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