Don't automatically use qop


git-svn-id: https://svn.calendarserver.org/repository/calendarserver@13796 e27351fd-9f3e-4f54-a53b-843176b1656c
Get latest twext with OD fix


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