Merge proposals dependent on lp://staging/~yvan-roux/cbuild/tools-4.8-fix

lp://staging/~yvan-roux/cbuild/tools-4.8-fix has no merge proposals.