Fix org parenting issues

* sites are correctly assigned to orgs which themselves belong to departments
* orgs do not get a parent prefix (UK Atomic Energy Authority org.abbr is now
    'ukaea' rather than 'bis_ukaea'
* sites retain their full redirector abbreviations for compatibility