Would you mind reverting the formatting of this file back to 4-space indentation?  It makes it difficult to see your changes.
Also, I don't recall ever changing our xml style standards to 2 spaces...