Remove properties that appeared from Steve's last branch merge. Automerge has...

Remove properties that appeared from Steve's last branch merge. Automerge has already run so everyone's branches based off of trunk are probably toast by now.


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