Updated XML Schemas to be compatible with XSD Diagram parsing tool

[dshevtsov]

Description

Updated XML Schemas to be compatible with XSD Diagram parsing tool

Fixed Issues (if relevant)

Contribution checklist

• Pull request has a meaningful description of its purpose
• All commits are accompanied by meaningful commit messages
• All new or changed code is covered with unit/verification tests (if applicable)
• All automated tests passed successfully (all builds on Travis CI are green)
• Changes to Framework doesn't have backward incompatible changes for tests or have related Pull Request with fixes to tests

[magento-cicd2]

Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.

[KevinBKozan]

Force merging this into feature branch to be squashed down later.