support nested exclude ranges for annotations
Merge remote-tracking branch 'origin/xwiki-544-editor-update' into virtuoso_em