Merge proposals dependent on lp://qastaging/~smspillaz/cmake/master

lp://qastaging/~smspillaz/cmake/master has no merge proposals.