Make extraction more tolerant of HTML changes

Change the xpath queries that were using child selectors to instead use
descendant selectors where appropriate. There can be interstitial
paragraph and/or list tags in the HTML markup depending on the wikitext markup
used when describing a particular deploy.

Change-Id: I1cbed75c555ef9483721f4ef4609db6dfe2ca12f