Merge proposals dependent on lp://qastaging/~cypressyew/cdts/fwts-local-name-change

lp://qastaging/~cypressyew/cdts/fwts-local-name-change has no merge proposals.