Overcome backwards xl-id form by handling both#422

niklasl wants to merge 2 commits intodeveloplibris/definitions:developfrom

feature/backwards_xl_idlibris/definitions:feature/backwards_xl_idCopy head branch name to clipboard