Update cla common and diversity constants
Merge branch 'develop' of github.com:ministryofjustice/cla_frontend into develop