Merge remaining 2.1.0 updates from main#725

kieran-broomhall-nhs merged 2 commits intorelease/v2.0NHSDigital/vaccinations-app:release/v2.0from

r2/2.1.0-update-from-mainNHSDigital/vaccinations-app:r2/2.1.0-update-from-mainCopy head branch name to clipboard