KRACOEUS-7010 : Add citizenship type to extended attributes and resolve issue related to spring selects with integer values.