Adopt to Nico's comments

Mostly minor things, with some churn to undo some of the misformatting
that xmllint did (it removed line breaks).

The comments about the actual description of the GSS negotiation loop
are not yet addressed.

Change-Id: I59d1040e4a171ba634e3b96214cb911971d81cf8