Merge proposals dependent on lp://qastaging/~xapantu/marlin/cmake

lp://qastaging/~xapantu/marlin/cmake has no merge proposals.