Merge branch '2022-02-03-assorted-fixes'

- Update CI image to have libgnutls available.
- Assorted ARM and SPL bugfixes