Merge proposals dependent on lp://staging/~pete-woods/thumbnailer/cmake-extras-compatibility

lp://staging/~pete-woods/thumbnailer/cmake-extras-compatibility has no merge proposals.