Merge r1229099 and r1231442 from trunk: Fix XML validation error. Add svn:keywords LastChangedRevision