Rolled back defSite.sitename and defSite.nickname ATLAS defaults in brokerage/SiteMapper.py