This ticket should be solved by https://github.com/xwiki/xwiki-platform/pull/2769 . When working on XWIKI-12471, I came across this bug and decided to fix it (without knowing that it was already reported).