Fix obsolete conflict with nuxeo-cmf

Local packages:
hotfix     started	nuxeo-9.10-HF01 (id: nuxeo-9.10-HF01-1.0.1) 
hotfix     started	nuxeo-9.10-HF02 (id: nuxeo-9.10-HF02-1.0.0) 
hotfix     started	nuxeo-9.10-HF03 (id: nuxeo-9.10-HF03-1.0.1) 
hotfix     started	nuxeo-9.10-HF04 (id: nuxeo-9.10-HF04-1.1.0) 
hotfix     started	nuxeo-9.10-HF05 (id: nuxeo-9.10-HF05-1.1.0) 
hotfix     started	nuxeo-9.10-HF06 (id: nuxeo-9.10-HF06-1.1.0) 
hotfix     started	nuxeo-9.10-HF07 (id: nuxeo-9.10-HF07-1.0.1) 
hotfix     started	nuxeo-9.10-HF08 (id: nuxeo-9.10-HF08-1.0.0) 
hotfix     started	nuxeo-9.10-HF09 (id: nuxeo-9.10-HF09-1.0.0) 
hotfix     started	nuxeo-9.10-HF10 (id: nuxeo-9.10-HF10-1.0.0) 
hotfix     started	nuxeo-9.10-HF11 (id: nuxeo-9.10-HF11-1.0.0) 
hotfix     started	nuxeo-9.10-HF12 (id: nuxeo-9.10-HF12-1.0.0) 
hotfix     started	nuxeo-9.10-HF13 (id: nuxeo-9.10-HF13-1.0.1) 
hotfix     started	nuxeo-9.10-HF14 (id: nuxeo-9.10-HF14-1.0.0) 
hotfix     started	nuxeo-9.10-HF15 (id: nuxeo-9.10-HF15-1.0.0) 
hotfix     started	nuxeo-9.10-HF16 (id: nuxeo-9.10-HF16-1.0.0) 
hotfix     started	nuxeo-9.10-HF17 (id: nuxeo-9.10-HF17-1.0.0) 
hotfix     started	nuxeo-9.10-HF18 (id: nuxeo-9.10-HF18-1.0.0) 
hotfix     started	nuxeo-9.10-HF19 (id: nuxeo-9.10-HF19-1.0.0) 
hotfix     started	nuxeo-9.10-HF20 (id: nuxeo-9.10-HF20-1.0.2) 
hotfix     started	nuxeo-9.10-HF21 (id: nuxeo-9.10-HF21-1.0.0) 
hotfix     started	nuxeo-9.10-HF22 (id: nuxeo-9.10-HF22-1.0.0) 
hotfix     started	nuxeo-9.10-HF23 (id: nuxeo-9.10-HF23-1.0.0) 
hotfix     started	nuxeo-9.10-HF24 (id: nuxeo-9.10-HF24-1.0.0) 
hotfix     started	nuxeo-9.10-HF25 (id: nuxeo-9.10-HF25-1.0.0) 
hotfix     started	nuxeo-9.10-HF26 (id: nuxeo-9.10-HF26-1.0.0) 
 addon     started	nuxeo-jsf-ui (id: nuxeo-jsf-ui-9.10.0-HF01) 
 addon     started	nuxeo-web-ui (id: nuxeo-web-ui-2.2.0) 
 addon     started	nuxeo-dam (id: nuxeo-dam-6.3.3)