Add opaque IDs to content on query from lookup collection.

This is required as part of the roll-forward of IDs into Atlas, as
there will not be IDs on content after the first phase of the
migration.
Merge branch 'add-ids-to-content-from-lookup' into stage