Avocet master merge

This is a re-creation of https://github.com/CUL-DigitalServices/avocet-ui/pull/246. I removed that PR from master after it was merged as I discovered there was a merge error in 14be3fc:

> I've removed this merge from master because your 14be3fc commit reintroduces the oae.api.profile which was deleted in a54147a.

I can't reopen a merged PR so I've made this one instead.