Changes to XSD to enable usage with Spring Bean Profiles.
(cherry picked from commit 45d9a3922ee700ca253cfd0ef22e4f6bb28b140c)