Missed return from last change.


git-svn-id: https://svn.calendarserver.org/repository/calendarserver@12264 e27351fd-9f3e-4f54-a53b-843176b1656c
Merge from trunk. Trigger an event split, if allowed, when a txn timeout occurs during setComponent().


git-svn-id: https://svn.calendarserver.org/repository/calendarserver@12265 e27351fd-9f3e-4f54-a53b-843176b1656c
check in WIP to share with Cyrus


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