This commit merges the contents of 7721, as it applied to the trunk version....

This commit merges the contents of 7721, as it applied to the trunk version. Added the item that would previously trigger a false error to test1.

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