In descriptiveKeywords: Don't display anchor xlink:href unless the
keyword/term is blank - otherwise confuses users when they click on the link
and get some funky XML
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x