Group institution_country_aliases by country then institution

This is the order of columns and grouping applied previously
to institution_countries. Having the same order in both table
makes the comparison and insertion of aliases easier.