APOLLO-3003 Replaced shortform array
Merge branch 'APOLLO-3003' of github.com:ministryofjustice/opg-core-public-domain-model into APOLLO-3003