Fix IFRC Roles, missing en-gb translations, catch a couple of places to check for skills deployment_setting, tweak Expiring Contracts report