Properly quote nested xml comments (Bug#6267) (Bug#20001)