Fix module.xml
Merge branch 'release/2.10' into release/2.11

* release/2.10:
  Fix module.xml
Merge branch 'release/2.11' into release/12.0

* release/2.11:
  Fix module.xml