Explitily set sort order on return of country lists.
Sort routines for id and name added to class.
Merge branch 'pr-adjust-method-parameter-names' into dev-master