Merge proposals dependent on lp://qastaging/~pete-woods/hud/cmake-extras-compatibility

lp://qastaging/~pete-woods/hud/cmake-extras-compatibility has no merge proposals.