Merge proposals dependent on lp://qastaging/~michael-sheldon/content-hub/fix-1390095

lp://qastaging/~michael-sheldon/content-hub/fix-1390095 has no merge proposals.