to XIF node names didn't make it into the output. Fix from rick, r=me. Also, a temp fix to the html output sink to get around bug 20246, and a couple of test case tweaks. git-svn-id: svn://10.0.0.236/trunk@54617 18797224-902f-48f8-a5cc-f745e15eee43