Update comps (see details)

* Start an 8.9 (may convert to .xml.in to match upstream?)
* Branch lh to 9.2 (there was a couple week gap in activity, assume
  this is the case)
* Update lh comps in general