BAMPFA-245: Fix computed fields not being refreshed on advanced search page.
Merge branch 'cspace-deployment_4.0' into bampfa_4.0
BAMPFA-205: Use primary nationality in person name calculation.