Merge proposals dependent on lp://qastaging/~ken-vandine/cupstream2distro-config/platform

lp://qastaging/~ken-vandine/cupstream2distro-config/platform has no merge proposals.