Some further cleanups:
- Leave the email element in the empty namespace instead of putting it in
  the XHTML namespace where it does not belong.
- Instead of overwriting handling of the email element for DocBook, just
  add support for role='nolink' .

Submitted by:	gabor
Resolve some unintended non-whitespace changes against head/ which crept in.
MFH updated directories up to r42195.
MFH up to r42224.