Merge branch 'master' into next

Merge problems (probably solved):
* new registry for bibedit - `ticket_templates`
* configuration moves
* import fixes

--
please have a look @lnielsen-cern @jalavik @jmartinm