APOLLO-3179 Updated return types
Merge branch 'APOLLO-3179' of github.com:ministryofjustice/opg-core-public-domain-model into APOLLO-3179