Allow username to be different from calendar name in server tests
Merge pull request #21277 from gaye/calendar-server-test-calendar-or-user-name

Allow username to be different from calendar name in server tests