Fix #817: Regression: xml:base attributes left behind by XIncludes cause config validations to fail; fix comment formatting LOL DONGS