Merge change 20146

* changes:
  Calendar attendee support: add columns.