some minor fixes found while working on issue #12911 (and block the rev from...

some minor fixes found while working on issue #12911 (and block the rev from 1.4 since the equivalent is already here)


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