Use self-contained defintions. Abstract loading logic
Merge branch 'develop' of github.com:ministryofjustice/tribunals_api into develop