Merge change 25885 into eclair

* changes:
  handle calendars with an access level of "root"