More XSD cleanups.
Merge XSD validation changes and make required updates to support updated schemas
Merge branch 'daley', remote-tracking branch 'origin'