Issue #20482 - different site zones can have same name if they're for different sites
Merge pull request #39 from mikerodonnell89/20482

20482
Merge remote-tracking branch 'QTCLIENT/master'