Make project_organisation_roles consistent across DRRPP, IFRC & trunk. Fix
bugs in orderby, s3translate, project, DRRPP