Expand xquartz zap stanza
Merge pull request #8536 from Dremora/xquartz

Expand xquartz zap stanza