am 17c674d1: ADT #1844909: Tweak XML schema, add more tests.

Merge commit '17c674d1057aeb3946747ca3b1d67a8468e1efb4'

* commit '17c674d1057aeb3946747ca3b1d67a8468e1efb4':
  ADT #1844909: Tweak XML schema, add more tests.