Fix some things


git-svn-id: https://svn.calendarserver.org/repository/calendarserver@12978 e27351fd-9f3e-4f54-a53b-843176b1656c
Stop with the quote unquote


git-svn-id: https://svn.calendarserver.org/repository/calendarserver@12979 e27351fd-9f3e-4f54-a53b-843176b1656c
quote shortName


git-svn-id: https://svn.calendarserver.org/repository/calendarserver@12980 e27351fd-9f3e-4f54-a53b-843176b1656c
Undo 12980 for this file


git-svn-id: https://svn.calendarserver.org/repository/calendarserver@12981 e27351fd-9f3e-4f54-a53b-843176b1656c