Broaden criteria for outputting brands in index

Previously, adding a brand to the index was only based on the
existence of on-demands in items, and not clips. This has now
been broadened; we'll output a brand if anywhere in its
hierarchy is a video of interest.
Filter locations based on whether they're
on the "web" service.
Merge branch 'mbst-9478-sitemap-improvements' into stage