Sync collabora/production back into collabora/staging

The default branch got accidentally reset when I went through the process of rebasing staging, so all the recent MRs were targeting the wrong branch. This should bring things back into sync.